gatsby-core-theme 43.0.2 → 44.0.0

package/CHANGELOG.md

@@ -1,3 +1,39 @@
+# [44.0.0](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v43.0.3...v44.0.0) (2025-03-12)
+
+
+### Bug Fixes
+
+* initial commit ([3f9b2ca](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/3f9b2ca86f7defabdffaa8849ccfd6d8d51da6e8))
+* key ([e1f416e](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/e1f416edd430f9d01f351c0b63b21d0a3e828e7d))
+* replace ul to ol ([018cfaa](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/018cfaa80f6ae65009a46356b9d7b0efa003571f))
+
+
+### Code Refactoring
+
+* more prop tyes fixes ([7d295aa](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/7d295aa99ee72947fa345b1ad87d832d9bce395d))
+* more proptype changes ([4558b10](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/4558b101b04e9dc674bc99153a2c978ec8e4a749))
+* prop type fixes ([ddf0f00](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/ddf0f00513f3e064e6170eaacc8e81f0f02ef500))
+* remove temp ([8fc0258](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/8fc0258a323ce5e51a80880d7f40a7f2e60688c0))
+* temp ([3793e8c](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/3793e8c3e9b5855c2b1b3a89dd78f1c71b0b3f69))
+
+
+* Merge branch 'tm-5274-update-toplist' into 'master' ([6603e74](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/6603e742c754803384ecf05df29c563203188737))
+* Merge branch 'proptype-fixes' into 'master' ([1246b93](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/1246b93b09b6e6b705f7343bbc319c709ca80503))
+* Merge branch 'tm-5310-sorting-schedule' into 'master' ([7b9ae5e](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/7b9ae5e95b534cba63f6cd13e4b4daea06b6d42e))
+* Merge branch 'master' into proptype-fixes ([277dccb](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/277dccbfc8e74ee1b1b7ce1e47cc669ed1bb6a4e))
+* Merge branch 'master' into proptype-fixes ([bc9779c](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/bc9779cf8e193b58172976f6554c4d73c78475f3))
+* Merge branch 'master' into proptype-fixes ([054e596](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/054e596465677ef81a84ce68c6011177eea5e0a1))
+
+## [43.0.3](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v43.0.2...v43.0.3) (2025-03-11)
+
+
+### Bug Fixes
+
+* add languages at pick keys ([fa57da7](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/fa57da79256c24903ac4394808de60ff3579b85e))
+
+
+* Merge branch 'tm-5103-info-grid-add-more-data' into 'master' ([0001a0a](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/0001a0aaf7a3e5f2a46f560d6cbbb5299917fcc4))
+
 ## [43.0.2](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v43.0.1...v43.0.2) (2025-03-10)
 
 

package/package.json

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

package/src/components/atoms/admin/bar/layout-section/index.js

@@ -1,5 +1,6 @@
 import React from "react";
 import PropTypes from "prop-types";
+import keygen from '~helpers/keygen';
 import styles from "./layout-section.module.scss";
 import Redirect from "./link";
 
@@ -24,19 +25,19 @@ const LayoutSection = ({ menus }) => {
   };
 
   return menus?.map((res) => (
-    <li>
+    <li key={keygen()}>
       <span className={`${styles.menuItem} ${styles.link}`}>{res.label}</span>
       <div className={styles.subMenuList}>
         <div className={styles.subMenuContianer}>
           {res?.sections?.map((section) => (
-            <ul className={styles.lists}>
+            <ul key={keygen()} className={styles.lists}>
               {section.label && (
-                <li>
+                <li key={keygen()}>
                   <span className={styles.label}>{section.label}</span>
                 </li>
               )}
               {section?.links?.map((link) => (
-                <li>
+                <li key={keygen()}>
                   <Redirect
                     icon={link?.icon}
                     path={paths(link?.type, link.data)}

package/src/components/atoms/admin/bar/layout-section/link/index.js

@@ -18,7 +18,7 @@ export default function Link({icon, path, linkText, description}) {
 }
 
 Link.propTypes = {
-  icon: PropTypes.string,
+  icon: PropTypes.node,
   path: PropTypes.string,
   linkText: PropTypes.string,
   description: PropTypes.string

package/src/components/atoms/button/button.js

@@ -54,7 +54,7 @@ function Button({
 
 Button.propTypes = {
   to: PropTypes.string,
-  icon: PropTypes.func,
+  icon: PropTypes.node,
   btnText: PropTypes.oneOfType([PropTypes.string, PropTypes.any]),
   targetBlank: PropTypes.bool,
   isInternalLink: PropTypes.bool,

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

@@ -92,17 +92,17 @@ Ratings.propTypes = {
   item: PropTypes.shape({
     name: PropTypes.string,
     bonus: PropTypes.shape({}),
-    rating: PropTypes.string,
+    rating: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
     status: PropTypes.string,
     rating_bonuses: PropTypes.string,
     rating_casino: PropTypes.string,
     rating_customer: PropTypes.string,
     rating_games: PropTypes.string,
     rating_payout: PropTypes.string,
-    first_rating: PropTypes.string,
-    second_rating: PropTypes.string,
-    third_rating: PropTypes.string,
-    fourth_rating: PropTypes.string,
+    first_rating: PropTypes.number,
+    second_rating: PropTypes.number,
+    third_rating: PropTypes.number,
+    fourth_rating: PropTypes.number,
     type: PropTypes.string,
   }),
   type: PropTypes.string,

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

@@ -89,10 +89,10 @@ Bonus.propTypes = {
   operator: PropTypes.shape({
     logo: PropTypes.shape({}),
     bonus: PropTypes.shape({
-      rating: PropTypes.string,
+      rating: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
     }),
     name: PropTypes.string,
-    rating: PropTypes.string,
+    rating: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
     url: PropTypes.string,
     extra_fields: PropTypes.shape({
       terms_and_conditions_text_enabled: PropTypes.string,

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

@@ -122,10 +122,10 @@ TemplateOne.propTypes = {
   operator: PropTypes.shape({
     logo: PropTypes.shape({}),
     bonus: PropTypes.shape({
-      rating: PropTypes.string,
+      rating: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
     }),
     name: PropTypes.string,
-    rating: PropTypes.string,
+    rating: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
     url: PropTypes.string,
     extra_fields: PropTypes.shape({
       terms_and_conditions_text_enabled: PropTypes.string,

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

@@ -101,7 +101,7 @@ Footer.propTypes = {
   }),
   page: PropTypes.shape({
     page: PropTypes.shape({
-      responsibleGaming: PropTypes.shape([]),
+      responsibleGaming: PropTypes.arrayOf(PropTypes.shape({})),
     })
   }),
 }

package/src/components/molecules/header/variants/operator/template-one-two/index.js

@@ -114,7 +114,7 @@ TemplateOneTwo.propTypes = {
     type: PropTypes.string,
     template: PropTypes.string,
     name: PropTypes.string,
-    rating: PropTypes.string,
+    rating: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
     status: PropTypes.string,
     ribbons: PropTypes.arrayOf(PropTypes.string),
   }),

package/src/components/molecules/header/variants/slot/template-one/index.js

@@ -81,7 +81,7 @@ SlotHeader.propTypes = {
     relation: PropTypes.shape({
       name: PropTypes.string,
       volatility: PropTypes.number,
-      average_rating: PropTypes.string,
+      average_rating: PropTypes.number,
       thumbnail_filename_object: PropTypes.string,
       logo: PropTypes.shape({}),
       slot: PropTypes.shape({
@@ -90,7 +90,7 @@ SlotHeader.propTypes = {
       }),
       markets: PropTypes.shape({
         ie_en: PropTypes.shape({
-          first_rating: PropTypes.string,
+          first_rating: PropTypes.number,
         }),
       }),
       affiliate_games: PropTypes.shape({

package/src/components/molecules/spotlights_v2/icon/template-one/index.js

@@ -1,5 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import keygen from '~helpers/keygen';
 import LazyImage from '../../../../../hooks/lazy-image';
 import Link from '../../../../../hooks/link';
 import { getAltText, imagePrettyUrl } from '../../../../../helpers/getters.mjs';
@@ -33,7 +34,7 @@ export default function TemplateOne({ module, width = 106, height = 106, loading
         items?.map((res) => {
           if (res.link?.value) {
             return (
-              <Link to={res?.link?.value} external={res?.link?.type === 'external'}>
+              <Link key={keygen()} to={res?.link?.value} external={res?.link?.type === 'external'}>
                 {content(res)}
               </Link>
             );

package/src/components/molecules/spotlights_v2/image/template-one/index.js

@@ -1,5 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import keygen from '~helpers/keygen';
 import LazyImage from '../../../../../hooks/lazy-image';
 import Link from '../../../../../hooks/link';
 import { getAltText, imagePrettyUrl } from '../../../../../helpers/getters.mjs';
@@ -31,7 +32,7 @@ export default function TemplateOne({ module, width = 295, height = 260 }) {
       {items?.map((res) => {
         if (res.link?.value) {
           return (
-            <Link to={res?.link?.value} external={res?.link?.type === 'external'}>
+            <Link key={keygen()} to={res?.link?.value} external={res?.link?.type === 'external'}>
               {content(res)}
             </Link>
           );
@@ -44,7 +45,7 @@ export default function TemplateOne({ module, width = 295, height = 260 }) {
 
 TemplateOne.propTypes = {
   module: PropTypes.shape({
-    items: PropTypes.shape([]),
+    items: PropTypes.arrayOf(PropTypes.shape({})),
   }).isRequired,
   width: PropTypes.number,
   height: PropTypes.number,

package/src/components/molecules/spotlights_v2/image/template-two/index.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { FaArrowRight } from '@react-icons/all-files/fa/FaArrowRight';
+import keygen from '~helpers/keygen';
 import LazyImage from '../../../../../hooks/lazy-image';
 import Link from '../../../../../hooks/link';
 import { getAltText, imagePrettyUrl } from '../../../../../helpers/getters.mjs';
@@ -34,7 +35,7 @@ export default function TemplateOne({ module, width = 340, height = 268 }) {
         items?.map((res) => {
           if (res.link?.value) {
             return (
-              <Link to={res?.link?.value} external={res?.link?.type === 'external'}>
+              <Link key={keygen()} to={res?.link?.value} external={res?.link?.type === 'external'}>
                 {content(res)}
               </Link>
             );
@@ -48,7 +49,7 @@ export default function TemplateOne({ module, width = 340, height = 268 }) {
 
 TemplateOne.propTypes = {
   module: PropTypes.shape({
-    items: PropTypes.shape({}),
+    items: PropTypes.arrayOf(PropTypes.shape({})),
   }).isRequired,
   width: PropTypes.number,
   height: PropTypes.number,

package/src/components/molecules/spotlights_v2/image-text/template-one/index.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { FaArrowRight } from '@react-icons/all-files/fa/FaArrowRight';
+import keygen from '~helpers/keygen';
 import LazyImage from '../../../../../hooks/lazy-image';
 import Button from '../../../../atoms/button/button';
 import { getAltText, imagePrettyUrl } from '../../../../../helpers/getters.mjs';
@@ -25,7 +26,7 @@ export default function TemplateOne({
         items?.map((res) => {
           const TitleTag = res?.title_tag || 'label';
           return (
-            <div className={`${styles.item} ${scrollableContent && styles.scrollContent}`}>
+            <div  key={keygen()} className={`${styles.item} ${scrollableContent && styles.scrollContent}`}>
               <div className={styles.topSection}>
                 {res?.image && (
                   <LazyImage
@@ -68,7 +69,7 @@ export default function TemplateOne({
 
 TemplateOne.propTypes = {
   module: PropTypes.shape({
-    items: PropTypes.shape({}),
+    items: PropTypes.arrayOf(PropTypes.shape({})),
   }).isRequired,
   scrollableContent: PropTypes.bool,
   buttonType: PropTypes.string,

package/src/components/molecules/spotlights_v2/image-text/template-three/index.js

@@ -1,5 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import keygen from '~helpers/keygen';
 import { cleanHTML } from '../../../../../helpers/strings';
 import styles from './template-three.module.scss';
 import Item from './item';
@@ -25,7 +26,8 @@ export default function TemplateOne({
           
           const readMoreCheck = plainText.length > characterMaxReadMore;
           return (
-            <Item
+            <Item 
+              key={keygen()}
               item={res}
               readMore={readMoreCheck ? readMore : false}
               scrollableContent={scrollableContent}
@@ -43,7 +45,7 @@ export default function TemplateOne({
 
 TemplateOne.propTypes = {
   module: PropTypes.shape({
-    items: PropTypes.shape({}),
+    items: PropTypes.arrayOf(PropTypes.shape({})),
   }).isRequired,
   readMore: PropTypes.bool,
   scrollableContent: PropTypes.bool,

package/src/components/molecules/spotlights_v2/image-text/template-two/index.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { FaArrowRight } from '@react-icons/all-files/fa/FaArrowRight';
+import keygen from '~helpers/keygen';
 import LazyImage from '../../../../../hooks/lazy-image';
 import Button from '../../../../atoms/button/button';
 import useTranslate from '~hooks/useTranslate/useTranslate';
@@ -26,7 +27,7 @@ export default function TemplateOne({
         items?.map((res) => {
           const TitleTag = res?.title_tag || titleType;
           return (
-            <div className={`${styles.item} ${scrollableContent && styles.scrollContent}`}>
+            <div key={keygen()} className={`${styles.item} ${scrollableContent && styles.scrollContent}`}>
               <div className={styles.topSection}>
                 {res?.image && (
                   <LazyImage
@@ -68,7 +69,7 @@ export default function TemplateOne({
 
 TemplateOne.propTypes = {
   module: PropTypes.shape({
-    items: PropTypes.shape({}),
+    items: PropTypes.arrayOf(PropTypes.shape({})),
   }).isRequired,
   scrollableContent: PropTypes.bool,
   buttonType: PropTypes.string,

package/src/components/molecules/toplist/default-row/index.js

@@ -105,7 +105,7 @@ Row.propTypes = {
     logo: PropTypes.shape({}),
     selling_points: PropTypes.arrayOf(PropTypes.string),
     review_link: PropTypes.string,
-    rating: PropTypes.string,
+    rating: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
     bonuses: PropTypes.shape({
       main: PropTypes.shape({
         one_liner: PropTypes.string

package/src/components/organisms/carousel/template-one/index.js

@@ -51,7 +51,6 @@ Carousel.propTypes = {
     ),
     name: PropTypes.string,
   }),
-  CustomSlideComponent: PropTypes.element,
   gtmClass: PropTypes.string,
 };
 

package/src/components/organisms/toplist/list/index.js

@@ -50,7 +50,7 @@ export default function List({
 
   return (
     <>
-      <ul className={styles.list || ''} key={keygen()}>
+      <ol className={styles.list || ''} key={keygen()}>
         {toplist.items?.map((item, index) => (
           <Row
             pagePath={pagePath}
@@ -67,7 +67,7 @@ export default function List({
             modulePosition={modulePosition}
           />
         ))}
-      </ul>
+      </ol>
       {showLoadMoreButton && (
         <div ref={loadMoreBtn} className={styles.loadMore || ''}>
           <Button

package/src/constants/pick-keys.mjs

@@ -123,6 +123,7 @@ export const pickRelationKeys = {
     "cooling_off_time_out_tool",
     "reality_check",
     "self_assessment_test",
+    'languages'
   ],
   operator_simplified: [
     "short_name",

package/src/helpers/processor/sports-relations.mjs

@@ -53,7 +53,8 @@ export const processSportsRelations = (
     relation.events = events;
     relation.tournaments = cloneDeep(sportsMarketData.tournaments);
     relation.schedule = filterScheduleByDate(
-      cloneDeep(sportsMarketData.schedule)
+      cloneDeep(sportsMarketData.schedule),
+      sportsMarketData.tournaments
     );
     relation.featured_events = Object.keys(events).filter(
       (id) => events[id].featured === 1
@@ -137,7 +138,7 @@ export const processSportsRelations = (
 
       if (schedule && schedule.soccer) {
         Object.entries(schedule.soccer).forEach(([date, value]) => {
-          Object.entries(value.tournaments).forEach(([tournamentId, value]) => {
+          Object.entries(value.tournaments).forEach(([tournamentId, ]) => {
             if (!tournamentIds.includes(parseInt(tournamentId))) {
               delete schedule.soccer[date].tournaments[tournamentId];
             }
@@ -151,7 +152,7 @@ export const processSportsRelations = (
 
       relation.teams = cloneDeep(data.relations.sports_data.teams);
       relation.events = events;
-      relation.schedule = schedule && schedule.soccer ? filterScheduleByDate(schedule) : {};
+      relation.schedule = schedule && schedule.soccer ? filterScheduleByDate(schedule, tournaments) : {};
       relation.tournaments = tournaments;
 
       const allFeaturedEvents = sportsMarketData ? Object.keys(sportsMarketData.events).filter(

package/src/helpers/schedule.mjs

@@ -6,20 +6,23 @@ export function zeroPadding(num, places) {
   return String(num).padStart(places, '0');
 }
 
-export function filterScheduleByDate(schedule) {
+export function filterScheduleByDate(schedule, tournaments) {
   const today = new Date().setHours(0, 0, 0, 0);
   let todayFound = false;
   let todayNextIndex = null;
+
   Object.keys(schedule.soccer).forEach((key, index) => {
     if (new Date(key).setHours(0, 0, 0, 0) === today) {
       schedule.soccer[key] = { ...schedule.soccer[key], active: true};
       todayFound = true;
       todayNextIndex = index;
     }
+    if(tournaments){
+      schedule.soccer[key].sorting = Object.keys(schedule.soccer[key].tournaments).sort(
+        (aKey, bKey) => tournaments?.[aKey]?.sort_order - tournaments?.[bKey]?.sort_order);
+    }
   });
 
-
-
   let nextDay = false;
   if(!todayFound) {
     Object.keys(schedule.soccer).forEach((key, index) => {
@@ -28,6 +31,10 @@ export function filterScheduleByDate(schedule) {
         nextDay = true;
         todayNextIndex = index;
       }
+      if(tournaments){
+        schedule.soccer[key].tournaments_sorted = Object.keys(schedule.soccer[key].tournaments).sort(
+          (aKey, bKey) => tournaments?.[aKey]?.sort_order - tournaments?.[bKey]?.sort_order);
+      }
     });
   }