gatsby-core-theme 1.6.0 → 1.6.4

package/.storybook/main.js

@@ -45,6 +45,7 @@ module.exports = {
       '~hooks': path.resolve(__dirname, '../src/hooks'),
       '~tests': path.resolve(__dirname, '../tests'),
       '~context': path.resolve(__dirname, '../src/context'),
+      '~constants': path.resolve(__dirname, '../src/constants'),
     };
 
     config.resolve.alias['$virtual/lazy-client-sync-requires'] = path.resolve(

package/CHANGELOG.md

@@ -1,3 +1,65 @@
+## [1.6.4](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v1.6.3...v1.6.4) (2021-11-22)
+
+
+### Bug Fixes
+
+* general issues ([419d8d3](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/419d8d36f7bfe153e7e07d2ad2b92cd19e597aa1))
+
+
+### Code Refactoring
+
+* align cards on search, dropdown z-index on mobile when open, lazyload force load on tab click ([1e44fa7](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/1e44fa74f6e6ac63169a9bca9affa40f96a7d3cc))
+
+
+* Merge branch 'tm-2478-search' into 'master' ([26e1a6e](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/26e1a6ebd7632a4b866d9e02f8edf58cca5a17f6))
+* Merge branch 'tm-2478-search' of git.ilcd.rocks:team-floyd/themes/gatsby-themes into tm-2478-search ([725ec14](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/725ec145917d2d7eb436f90cbb87a5427300166d))
+* Merge branch 'master' into tm-2478-search ([9be2cb8](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/9be2cb83d0948f9925b8e199064e075a44fc2f6d))
+
+## [1.6.3](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v1.6.2...v1.6.3) (2021-11-18)
+
+
+### Bug Fixes
+
+* html sitemap filters ([58892f4](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/58892f4a694be085c32ea80daef50f7c59ee8d87))
+
+## [1.6.2](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v1.6.1...v1.6.2) (2021-11-17)
+
+
+### Bug Fixes
+
+* filter events fnc error build ([9324fdf](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/9324fdf9e99233b9857d9b60dd7973466f5df6ba))
+
+
+* Merge branch 'fix-showcased-event' into 'master' ([a2d4959](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/a2d49594cc73321dffd5258e2094e84c255151b0))
+
+## [1.6.1](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v1.6.0...v1.6.1) (2021-11-17)
+
+
+### Bug Fixes
+
+* fixed outdated showcased events ([a11df67](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/a11df675e280f106e93c0dd760186b939baff47f))
+* lazy image fix when src is null ([3f2a8b2](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/3f2a8b21831e22b0ca9c3253a0dfa381ee9dd23d))
+
+
+### Code Refactoring
+
+* implement generateSchemaObject and checkSchemaProp in schema ([52066db](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/52066db3235af1c72e01f666babb13d2d86b0e74))
+* implement month and year placeholders for meta_title ([89fb697](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/89fb6976c2fa55946a72d53f3944105dd89e660e))
+* remove double slash for contactPoint url in schema ([01e0cdc](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/01e0cdcc28a05079da048609b2e556624ac4f6c3))
+* remove log ([183ff76](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/183ff769e0fa3b32b5122c07e979215a20684d59))
+* update generateMetaTitle with translations ([4c458a1](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/4c458a1a914b22c62354279034405733bed53521))
+
+
+* Merge branch 'tm-2594-month-year-placeholders' into 'master' ([f2c58eb](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/f2c58ebe51e7cf3ef9319b9f90557e310c08f6d4))
+* Merge branch 'fix-showcased-events' into 'master' ([78cfcc0](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/78cfcc0ae51c4f93c1531e58c479c2869ba8032c))
+* Merge branch 'tm-2588-lazy-image-fix' into 'master' ([5d414d0](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/5d414d0ec4f32cfe8b9aa95edbbc9deaf716ad0e))
+* Merge branch 'tm-2589-update-schema-and-fix-duplicates' into 'master' ([c63dd13](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/c63dd13d230cd3e9558cdee4c275ee6b4092e726))
+
+
+### Tests
+
+* added test for meta title generator ([02295b2](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/02295b20a37c6e09b62f27345fafc8667612ac18))
+
 # [1.6.0](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v1.5.0...v1.6.0) (2021-11-12)
 
 

package/gatsby-node.esm.js

@@ -4,7 +4,7 @@
 import { cloneDeep, chunk, pick } from 'lodash';
 import chalk from 'chalk';
 import { getData, getLocalData } from './src/helpers/api';
-import { generateTrackerLink } from './src/helpers/generators';
+import { generateMetaTitle, generateTrackerLink } from './src/helpers/generators';
 import processor, { processSitemapPages } from './src/helpers/processor';
 import { pickAuthorsPageKeys } from './src/constants/pick-keys';
 
@@ -210,6 +210,8 @@ exports.createPages = async ({ actions: { createPage } }, themeOptions) => {
         page.authors = Object.keys(authors || {}).map((key) =>
           pick(authors[key], pickAuthorsPageKeys)
         );
+        // Done for matrix-theme sites for [MONTH][YEAR] auto update
+        page.meta_title = page.meta_title && generateMetaTitle(page.meta_title, translations);
 
         const contextData = {
           page,
@@ -362,6 +364,7 @@ exports.onCreateWebpackConfig = ({ actions, plugins, getConfig }) => {
         '~hooks': path.resolve(__dirname, 'src/hooks'),
         '~tests': path.resolve(__dirname, 'tests'),
         '~context': path.resolve(__dirname, 'src/context'),
+        '~constants': path.resolve(__dirname, 'src/constants'),
       },
     },
   });

package/jest.config.js

@@ -15,6 +15,7 @@ module.exports = {
     '^~hooks(.*)$': '<rootDir>/src/hooks$1',
     '^~tests(.*)$': '<rootDir>/tests$1',
     '^~context(.*)$': '<rootDir>/src/context$1',
+    '^~constants(.*)$': '<rootDir>/src/constants$1',
     // JSON Data
     'data.json': '<rootDir>/__mocks__/search-data.json',
   },

package/package.json

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

package/src/components/atoms/author-box/index.js

@@ -78,7 +78,10 @@ export default function AuthorBox({ author }) {
                   </a>
                 ))}
             </p>
-            <p className={styles.biography}>{author.biography}</p>
+            <div
+              className={styles.biography}
+              dangerouslySetInnerHTML={{ __html: author.biography }}
+            />
           </div>
           {author.profile_page_path && (
             <Link

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

@@ -15,7 +15,9 @@ const Archive = ({ module, PaginationComponent, page, loadMore, gtmClass = '' })
 
   useEffect(() => {
     if (module.pagination_type === 'load_more') {
-      const items = module.items.filter((item, index) => index < parseInt(loadMore.limit));
+      const items = module.items.filter(
+        (item, index) => index < parseInt(loadMore ? loadMore.limit : 9)
+      );
       setModuleItems(items);
     }
   }, [module, module.items, loadMore]);
@@ -24,7 +26,7 @@ const Archive = ({ module, PaginationComponent, page, loadMore, gtmClass = '' })
     let items = [...module.items];
     if (items.length > moduleItems.length) {
       items = items.filter(
-        (item, index) => index < moduleItems.length + parseInt(loadMore.increment)
+        (item, index) => index < moduleItems.length + parseInt(loadMore ? loadMore.increment : 9)
       );
       setModuleItems(items);
     }

package/src/components/organisms/cards/cards.module.scss

@@ -2,15 +2,15 @@
   display: grid;
 
   @include min(mobile) {
-    grid-template-columns: repeat(var(--cards-mob-column), 1fr);
+    grid-template-columns: repeat(var(--cards-mob-column), minmax(0,1fr));
   }
 
   @include min(tablet) {
-    grid-template-columns: repeat(var(--cards-tablet-column), 1fr);
+    grid-template-columns: repeat(var(--cards-tablet-column), minmax(0,1fr));
   }
 
   @include min(desktop) {
-    grid-template-columns: repeat(var(--cards-desktop-column), 1fr);
+    grid-template-columns: repeat(var(--cards-desktop-column), minmax(0,1fr));
   }
   column-gap: 0.8rem;
   @include min(desktop) {

package/src/constants/common.js

@@ -0,0 +1,15 @@
+/* eslint-disable import/prefer-default-export */
+export const months = [
+  'January',
+  'February',
+  'March',
+  'April',
+  'May',
+  'June',
+  'July',
+  'August',
+  'September',
+  'October',
+  'November',
+  'December',
+];

package/src/helpers/generators.js

@@ -1,4 +1,5 @@
-// eslint-disable-next-line
+import { months } from '../constants/common';
+
 export function generateTrackerLink(operator, trackerType) {
   const defaultTrackerFormat = process.env.TRACKER_LINK_FORMAT_MAIN;
   const trackerFormat = process.env.TRACKER_LINK_FORMAT_NON_MAIN;
@@ -19,3 +20,18 @@ export function generateTrackerLink(operator, trackerType) {
     return `/${trackerArr.join('/')}`;
   }
 }
+
+export function generateMetaTitle(metaTitle, translations) {
+  const date = new Date();
+  const month = months[date.getMonth()];
+  const year = date.getFullYear();
+
+  return metaTitle.replace(
+    /\[MONTH\]|\[YEAR\]/gi,
+    (match) =>
+      ({
+        '[MONTH]': (translations && translations[month]) || month,
+        '[YEAR]': year,
+      }[match])
+  );
+}

package/src/helpers/generators.test.js

@@ -1,4 +1,5 @@
-import { generateTrackerLink } from './generators';
+import { generateTrackerLink, generateMetaTitle } from './generators';
+import { months } from '~constants/common';
 
 describe('Generate Tracker Link Helper', () => {
   test('generateTrackerLink main', () => {
@@ -14,3 +15,26 @@ describe('Generate Tracker Link Helper', () => {
     expect(trackerLink).toEqual('/no/visit/bet365/casino/non_main');
   });
 });
+
+describe('Generate Meta Title Helper', () => {
+  test('generateMetaTitle main', () => {
+    const metaTitle = generateMetaTitle('meta title [MONTH] [YEAR]');
+    const date = new Date();
+    expect(metaTitle).not.toContain('[MONTH]');
+    expect(metaTitle).not.toContain('[YEAR]');
+    expect(metaTitle).toContain(date.getFullYear());
+    expect(metaTitle).toContain(months[date.getMonth()]);
+  });
+  test('generateMetaTitle translated', () => {
+    const translateMonths = months.reduce(
+      (translated, month) => ({ ...translated, [month]: `translate${month.substring(0, 1)}` }),
+      {}
+    );
+    const metaTitle = generateMetaTitle('meta title [MONTH] [YEAR]', translateMonths);
+    const date = new Date();
+
+    expect(metaTitle).not.toContain('[MONTH]');
+    expect(metaTitle).not.toContain('[YEAR]');
+    expect(metaTitle).toContain(translateMonths[months[date.getMonth()]]);
+  });
+});

package/src/helpers/processor/index.js

@@ -39,9 +39,11 @@ export function processSitemapPages(pages, markets) {
     pageListByMarket[market] = [];
     let pageList = [];
     Object.keys(pages[market]).forEach((pageType) => {
-      pageList = pageList.concat(
-        pages[market][pageType].map((row) => pick(row, pickHTMLSitemapPageKeys))
+      const filteredPages = pages[market][pageType].filter(
+        (page) => page.robot_options && page.robot_options.page_index === 1
       );
+
+      pageList = pageList.concat(filteredPages.map((row) => pick(row, pickHTMLSitemapPageKeys)));
     });
 
     pageListByMarket[market] = groupBy(pageList, 'template_id');

package/src/helpers/processor/sports.js

@@ -58,7 +58,9 @@ export function prepareSportsData(sportsData) {
   });
 
   Object.keys(sportsData.showcased_events).forEach((sportKey) => {
-    sportsData.showcased_events[sportKey] = sportsData.showcased_events[sportKey]
+    const filteredEventIds = filterEvents(sportsData.showcased_events[sportKey], sportsData.events);
+
+    sportsData.showcased_events[sportKey] = filteredEventIds
       .map((eventId) => sportsData.events[eventId])
       .filter((event) => event);
   });

package/src/helpers/schedule.js

@@ -104,15 +104,17 @@ export function filterEvents(tournamentEvents, events) {
   const futureEvents = [];
   const today = new Date().setHours(0, 0, 0, 0);
   tournamentEvents.forEach((eventId) => {
-    const eventDate = new Date(
-      `${events[eventId].date.year_number}-${zeroPadding(
-        events[eventId].date.month_number,
-        2
-      )}-${zeroPadding(events[eventId].date.day_number, 2)}`
-    );
+    if (events[eventId]) {
+      const eventDate = new Date(
+        `${events[eventId].date.year_number}-${zeroPadding(
+          events[eventId].date.month_number,
+          2
+        )}-${zeroPadding(events[eventId].date.day_number, 2)}`
+      );
 
-    if (eventDate >= today) {
-      futureEvents.push(eventId);
+      if (eventDate >= today) {
+        futureEvents.push(eventId);
+      }
     }
   });
 

package/src/helpers/schema.js

@@ -1,4 +1,3 @@
-/* eslint-disable no-use-before-define */
 import { getGameRating, getUrl, getLanguage } from './getters';
 
 /* HardCoded Start */
@@ -53,20 +52,30 @@ const socialLinks = [
   'youtube',
 ];
 
-export function schemaGenerator(page = {}, pageImage) {
-  const jsonSchema = [
-    // Page Schema
-    page.seo_json_schema,
-    // Breadcrumbs Schema
-    page.breadcrumbs?.length ? breadcrumbsSchema(page.breadcrumbs) : null,
-    // Modules Schemas
-    webPageSchema(page, pageImage),
-    organizationSchema(page, pageImage),
-    templateSchemas(page),
-    ...(page.sections?.main?.modules ? moduleSchemas(page.sections.main.modules) : [null]),
-  ];
+function checkSchemaProp(prop) {
+  return (
+    (!Array.isArray(prop) || (Array.isArray(prop) && prop.length)) &&
+    prop !== undefined &&
+    prop !== null &&
+    prop !== ''
+  );
+}
 
-  return jsonSchema;
+export function generateSchemaObject(schema) {
+  return Object.keys(schema).reduce((obj, key) => {
+    if (
+      Object.prototype.toString.call(schema[key]) === '[object Object]' &&
+      Object.keys(schema[key]).length
+    ) {
+      obj[key] = generateSchemaObject(schema[key]);
+    }
+
+    if (checkSchemaProp(schema[key])) {
+      obj[key] = schema[key];
+    }
+
+    return obj;
+  }, {});
 }
 
 export function breadcrumbsSchema(breadcrumbs) {
@@ -83,7 +92,7 @@ export function breadcrumbsSchema(breadcrumbs) {
     })),
   };
 
-  return JSON.stringify(schema);
+  return JSON.stringify(generateSchemaObject(schema));
 }
 
 export function webPageSchema(page, pageImage) {
@@ -118,7 +127,7 @@ export function webPageSchema(page, pageImage) {
         contactType: 'Author',
         name: author.name || '',
         email: author.email_address || '',
-        url: `${getUrl('/')}/${author.profile_page_path}`,
+        url: `${getUrl('/')}${author.profile_page_path}`,
       })),
       sameAs: socialLinks
         .map((socialLink) => page.siteSchema?.[socialLink])
@@ -140,7 +149,7 @@ export function webPageSchema(page, pageImage) {
     schema.keywords = page.seo_keywords;
   }
 
-  return JSON.stringify(schema);
+  return JSON.stringify(generateSchemaObject(schema));
 }
 
 export function organizationSchema(page, pageImage) {
@@ -155,7 +164,7 @@ export function organizationSchema(page, pageImage) {
       .filter((socialLink) => socialLink),
   };
 
-  return JSON.stringify(schema);
+  return JSON.stringify(generateSchemaObject(schema));
 }
 
 export function moduleSchemas(modules) {
@@ -175,7 +184,7 @@ export function moduleSchemas(modules) {
           })),
         };
 
-        return JSON.stringify(moduleSchema);
+        return JSON.stringify(generateSchemaObject(moduleSchema));
       }
       default: {
         return null;
@@ -214,7 +223,7 @@ export function templateSchemas(page) {
         },
       };
 
-      return JSON.stringify(schema);
+      return JSON.stringify(generateSchemaObject(schema));
     }
     case 'operator': {
       const schema = {
@@ -249,7 +258,7 @@ export function templateSchemas(page) {
         },
       };
 
-      return JSON.stringify(schema);
+      return JSON.stringify(generateSchemaObject(schema));
     }
     case 'game': {
       const rating = Math.floor(getGameRating(page.relation) * 2);
@@ -288,9 +297,25 @@ export function templateSchemas(page) {
         },
       };
 
-      return JSON.stringify(schema);
+      return JSON.stringify(generateSchemaObject(schema));
     }
     default:
       return null;
   }
 }
+
+export function schemaGenerator(page = {}, pageImage) {
+  const jsonSchema = [
+    // Page Schema
+    page.seo_json_schema,
+    // Breadcrumbs Schema
+    page.breadcrumbs?.length ? breadcrumbsSchema(page.breadcrumbs) : null,
+    // Modules Schemas
+    webPageSchema(page, pageImage),
+    organizationSchema(page, pageImage),
+    templateSchemas(page),
+    ...(page.sections?.main?.modules ? moduleSchemas(page.sections.main.modules) : [null]),
+  ];
+
+  return jsonSchema;
+}

package/src/helpers/schema.test.js

@@ -111,8 +111,8 @@ describe('Schema Helper', () => {
     expect(json.author.contactPoint[1]['@type']).toEqual('ContactPoint');
     expect(json.author.contactPoint[0].contactType).toEqual('Author');
     expect(json.author.contactPoint[1].contactType).toEqual('Author');
-    expect(json.author.contactPoint[0].url).toEqual(`${getUrl('/')}/author_a/author_page`);
-    expect(json.author.contactPoint[1].url).toEqual(`${getUrl('/')}/author_b/author_page`);
+    expect(json.author.contactPoint[0].url).toEqual(`${getUrl('/')}author_a/author_page`);
+    expect(json.author.contactPoint[1].url).toEqual(`${getUrl('/')}author_b/author_page`);
     expect(json.author.contactPoint[0].name).toEqual('Author_A');
     expect(json.author.contactPoint[1].name).toEqual('Author_B');
     expect(json.author.contactPoint[0].email).toEqual('email_a@email.com');

package/src/hooks/lazy-image/index.js

@@ -21,7 +21,7 @@ export default function LazyImage({
 }) {
   const [errorImage, setErrorImage] = useState(false);
 
-  if (defaultImg && errorImage === true) {
+  if ((defaultImg && !src) || errorImage === true) {
     return defaultImg;
   }
 

package/src/hooks/tabs/index.js

@@ -1,5 +1,6 @@
 import React, { useState } from 'react';
 import PropTypes from 'prop-types';
+import { forceCheck } from 'react-lazyload';
 import TabList from './tab/tab-list';
 import styles from './tabs.module.scss';
 
@@ -24,6 +25,7 @@ const Tabs = ({
 
   function onClickTabItem(tabId) {
     setActiveTab(tabId);
+    forceCheck();
   }
 
   return (

package/src/styles/utils/_animations.scss

@@ -11,7 +11,7 @@
     opacity: 1;
     z-index: map-get($z-index, modal);
     &.list {
-      z-index: map-get($z-index, above-content);
+      z-index: map-get($z-index, --scroll-to-top-index);
     }
   }
 }

package/tests/factories/pages/list.factory.js

@@ -13,6 +13,9 @@ export default function getPageDataList(length) {
     template_id: '5',
     name: 'Rizk Casino',
     logo_url: '#',
+    robot_options: {
+      page_index: 1,
+    },
     banner: '313df295c19d7c5f137ceda9d0cc5df7.jpeg',
     meta_title: 'my meta title',
     language: 'en',