gatsby-core-theme 30.0.57 → 30.0.59

package/CHANGELOG.md

@@ -1,3 +1,28 @@
+## [30.0.59](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v30.0.58...v30.0.59) (2024-01-24)
+
+
+### Bug Fixes
+
+* casinomobile cards ([99b5662](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/99b5662635ff607f841eb2baa83521b46f56b5f6))
+* prefilled modules ([e7405b1](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/e7405b1aab3e5a1cde92d1ec77283c8dc13a6780))
+
+## [30.0.58](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v30.0.57...v30.0.58) (2024-01-23)
+
+
+### Bug Fixes
+
+* cookie consent ([0e6fa43](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/0e6fa43da500b195bfeec7f5c4ea8df44eeb711b))
+* removed gap ([325589d](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/325589dc50551a287837564b11257a408df00047))
+
+
+### Code Refactoring
+
+* hide arrow on image mode template two for spotlights if link is not added ([e744e09](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/e744e09a1f7df152709a576c65461cf62c1370d6))
+
+
+* Merge branch 'tm-3950-spotlights' into 'master' ([9707c5c](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/9707c5c786fe0ab7f7fd764c4d7efc466b1f47b1))
+* Merge branch 'tm-3981-grouping-bottom-page' into 'master' ([0da1509](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/0da150983e5a437722ed767dba318ee1729badf6))
+
 ## [30.0.57](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v30.0.56...v30.0.57) (2024-01-19)
 
 

package/package.json

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

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

@@ -16,7 +16,7 @@ export default function TemplateOne({ module }) {
       {res?.image && <LazyImage src={imagePrettyUrl(res?.image)} />}
       <p>
         {res?.link_text || translate(translations, 'link_text_spotlights', 'Top Online Casinos')}{' '}
-        <FaArrowRight size={20} color="#fff" />
+        {res.link?.value && <FaArrowRight size={20} color="#fff" />}
       </p>
       {res.subtitle && <span>{res.subtitle}</span>}
     </>

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

@@ -30,10 +30,12 @@ export default function TemplateOne({
                 )}
                 {res?.label && <TitleTag>{res.label}</TitleTag>}
                 {res.subtitle && <span>{res.subtitle}</span>}
-                <div
-                  className={`${styles.desc} ${scrollableContent ? styles.scroll : ''}`}
-                  dangerouslySetInnerHTML={{ __html: res?.text }}
-                />
+                {res?.text && (
+                  <div
+                    className={`${styles.desc} ${scrollableContent ? styles.scroll : ''}`}
+                    dangerouslySetInnerHTML={{ __html: res?.text }}
+                  />
+                )}
               </div>
 
               {res?.link?.value && (

package/src/components/molecules/spotlights_v2/image-text/template-one/template-one.module.scss

@@ -4,11 +4,13 @@
   @include flex-direction(column);
   @include flex-align(center, center);
   gap: 1.6rem;
+
   @include min(tablet) {
     display: grid;
     grid-template-columns: repeat(3, 1fr);
   }
 }
+
 .item {
   border-radius: 1.6rem;
   background: var(--spotlight-template-one-backgorund-image-text-mode, #fff);
@@ -18,16 +20,19 @@
   padding: 1.6rem;
   gap: 1.6rem;
   @include flex-direction(column);
-  @include flex-align(start, space-between);
+  @include flex-align(stretch, space-between);
+
   > a {
     min-height: 5.6rem;
     width: 100%;
     white-space: normal;
   }
 }
+
 .topSection {
   @include flex-direction(column);
   gap: 1.6rem;
+
   > img {
     width: 100%;
     height: 17.6rem;
@@ -36,7 +41,6 @@
     margin-bottom: 0.8rem;
   }
 
-
   a > label,
   a > span,
   a > h1,
@@ -58,7 +62,7 @@
 }
 
 .desc {
-  color: var(--uspotlight-template-one-desc-image-text-mode, #515156);
+  color: var(--spotlight-template-one-desc-image-text-mode, #515156);
   text-align: justify;
   font-size: 1.6rem;
   font-style: normal;
@@ -68,9 +72,10 @@
 }
 
 .scroll {
-  height: 18rem;
-  overflow-y: scroll;
+  max-height: 18rem;
+  overflow-y: auto;
   padding-right: 1.6rem;
+
   &::-webkit-scrollbar {
     width: .6rem;
   }
@@ -89,6 +94,7 @@
     background: #555;
   }
 }
+
 .scrollContent{
   padding: 2.4rem;
 }

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

@@ -27,12 +27,14 @@ export default function TemplateOne({
       <div className={styles.topSection}>
         {item?.image && <LazyImage width={104} height={104} src={imagePrettyUrl(item?.image)} />}
         {item?.label && <TitleTag>{item?.label}</TitleTag>}
-        <div
-          className={`${styles.desc} ${scrollableContent ? styles.scroll : ''} ${
-            readMore && !scrollableContent && !showMore ? styles.readMore : ''
-          }`}
-          dangerouslySetInnerHTML={{ __html: item?.text }}
-        />
+        {item?.text && (
+          <div
+            className={`${styles.desc} ${scrollableContent ? styles.scroll : ''} ${
+              readMore && !scrollableContent && !showMore ? styles.readMore : ''
+            }`}
+            dangerouslySetInnerHTML={{ __html: item?.text }}
+          />
+        )}
         {readMore && !scrollableContent && (
           <span onClick={() => setShowMore(!showMore)} className={styles.readMoreBtn}>
             {!showMore ? (

package/src/components/molecules/spotlights_v2/image-text/template-three/item/style.module.scss

@@ -2,30 +2,33 @@
   @include flex-direction(column);
   @include flex-align(center, center);
   gap: 0.8rem;
+
   @include min(tablet) {
     display: grid;
     grid-template-columns: repeat(2, auto);
-    align-items: flex-start;
   }
+
   > img {
     width: 8rem;
     height: 8rem;
     object-fit: cover;
     border-radius: 100%;
     margin-bottom: 1.6rem;
+
     @include min(tablet) {
-      grid-column: 1/2;
-      grid-row: 1/5;
+      grid-row: 1 / span 2;
+      grid-column: 1;
       width: 12rem;
       height: 12rem;
-      margin-top: 4rem;
-      margin-right: 2.4rem;
+      margin: 0;
     }
+
     @include min(laptop){
       width: 12.6rem;
       height: 12.6rem;
     }
   }
+
   > label {
     color: var(--spotlight-template-two-label-image-text-mode, #1b1b1c);
     font-size: 1.8rem;
@@ -33,19 +36,23 @@
     font-weight: 700;
     line-height: 2.8rem;
     text-transform: capitalize;
+
     @include min(tablet) {
-      grid-column: 2/3;
-      grid-row: 1/2;
       font-size: 2.2rem;
       line-height: 3rem;
+      grid-column: 2;
     }
   }
+
   > h2,
   h3,
   h4 {
+    font-size: 2.2rem;
+    font-weight: 700;
+    line-height: 3rem;
+
     @include min(tablet) {
-      grid-column: 2/3;
-      grid-row: 1/2;
+      grid-column: 2;
     }
   }
 }
@@ -58,9 +65,9 @@
   font-weight: 700;
   line-height: 2.2rem;
   margin-bottom: 1.6rem;
+
   @include min(tablet) {
-    grid-column: 2/3;
-    grid-row: 2/3;
+    grid-column: 2;
   }
 }
 
@@ -74,6 +81,7 @@
   gap: 1.6rem;
   @include flex-direction(column);
   @include flex-align(start, space-between);
+
   > a {
     height: 5.6rem;
     width: 100%;
@@ -81,33 +89,29 @@
 }
 
 .desc {
-  color: var(--uspotlight-template-one-desc-image-text-mode, #515156);
+  color: var(--spotlight-template-one-desc-image-text-mode, #515156);
   text-align: justify;
   font-size: 1.6rem;
   font-style: normal;
   font-weight: 400;
   line-height: 2.7rem;
   margin-bottom: 0.8rem;
-  @include min(tablet){
-    grid-column: 2/3;
-    grid-row: 2/3;
-}
 
+  @include min(tablet) {
+    grid-column: 2;
+  }
 }
 
 .readMore {
   height: 13.5rem;
   overflow: hidden;
-  @include min(tablet){
-    grid-column: 2/3;
-    grid-row: 2/3;
-}
 }
 
 .scroll {
-  height: 16.2rem;
-  overflow-y: scroll;
+  max-height: 16.2rem;
+  overflow-y: auto;
   padding-right: 1.6rem;
+
   &::-webkit-scrollbar {
     width: 0.6rem;
   }
@@ -137,11 +141,12 @@
   font-weight: 600;
   line-height: 2.7rem;
   cursor: pointer;
-  @include min(tablet){
-    grid-column: 2/3;
-    grid-row: 3/4;
-}
+
   > svg {
     margin-left: 0.4rem;
   }
+
+  @include min(tablet) {
+    grid-column: 2;
+  }
 }

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

@@ -30,10 +30,12 @@ export default function TemplateOne({
                 )}
                 {res?.label && <TitleTag>{res.label}</TitleTag>}
                 {res.subtitle && <span>{res.subtitle}</span>}
-                <div
-                  className={`${styles.desc} ${scrollableContent ? styles.scroll : ''}`}
-                  dangerouslySetInnerHTML={{ __html: res?.text }}
-                />
+                {res?.text && (
+                  <div
+                    className={`${styles.desc} ${scrollableContent ? styles.scroll : ''}`}
+                    dangerouslySetInnerHTML={{ __html: res?.text }}
+                  />
+                )}
               </div>
               {res?.link?.value && (
                 <Button

package/src/components/molecules/spotlights_v2/image-text/template-two/template-two.module.scss

@@ -4,11 +4,13 @@
   @include flex-direction(column);
   @include flex-align(center, center);
   gap: 1.6rem;
+
   @include min(tablet) {
     display: grid;
     grid-template-columns: repeat(3, 1fr);
   }
 }
+
 .item {
   border-radius: 1.6rem;
   background: var(--spotlight-template-two-backgorund-image-text-mode, #fff);
@@ -18,17 +20,20 @@
   padding: 2.4rem;
   gap: 1.6rem;
   @include flex-direction(column);
-  @include flex-align(start, space-between);
+  @include flex-align(stretch, space-between);
+
   > a {
     min-height: 5.6rem;
     width: 100%;
     white-space: normal;
   }
 }
+
 .topSection {
   @include flex-direction(column);
   @include flex-align(center, center);
   gap: .8rem;
+
   > img {
     width: 10.4rem;
     height: 10.4rem;
@@ -37,7 +42,6 @@
     margin-bottom: 1.6rem;
   }
   
-  
   a > label,
   a > span,
   a > h1,
@@ -57,7 +61,6 @@
     text-align: center;
   }
 
-
   a > span, > span {
     color: #64646d;
     text-align: center;
@@ -70,7 +73,7 @@
 }
 
 .desc {
-  color: var(--uspotlight-template-one-desc-image-text-mode, #515156);
+  color: var(--spotlight-template-one-desc-image-text-mode, #515156);
   text-align: justify;
   font-size: 1.6rem;
   font-style: normal;
@@ -80,9 +83,10 @@
 }
 
 .scroll {
-  height: 18rem;
-  overflow-y: scroll;
+  max-height: 18rem;
+  overflow-y: auto;
   padding-right: 1.6rem;
+
   &::-webkit-scrollbar {
     width: .6rem;
   }

package/src/components/organisms/cookie-consent/index.js

@@ -19,15 +19,12 @@ const CookieConsent = ({
 }) => {
   const cookieName = 'CookieConsent';
   // states
-  const [ck, setCk] = useState(true);
+  const [ck, setCk] = useState(
+    (typeof window !== `undefined` && getCookie(cookieName) === 'true') || false
+  );
   const { showModal } = useContext(ModalContext);
   const { translations } = useContext(Context) || {};
 
-  useEffect(() => {
-    const getCk = Boolean(getCookie(cookieName)) || false;
-    setCk(getCk);
-  }, [ck]);
-
   // when user declines
   const handleDecline = () => {
     if (declineURL !== '') navigate(`/${declineURL}`);

package/src/components/pages/body/body.module.scss

@@ -1,7 +1,11 @@
 .floatingArea{
     @include flex-direction(column);
-    gap: 1rem;
     width: 100%;
     position: fixed;
+    transition: all 1s;
+    bottom: -30rem;
+}
+
+.show {
     bottom: 0;
 }

package/src/components/pages/body/index.js

@@ -1,7 +1,7 @@
 /* eslint-disable camelcase */
 /* eslint-disable no-useless-concat */
 /* eslint-disable no-restricted-globals */
-import React, { useEffect, useRef } from 'react';
+import React, { useEffect } from 'react';
 import PropTypes from 'prop-types';
 import loadable from '@loadable/component';
 // eslint-disable-next-line import/no-extraneous-dependencies
@@ -25,7 +25,6 @@ function Body({ pageContext, children, hideOperatorBanner, serverData, offsetTop
   const main = getBodySection('main');
   const navigation = getBodySection('navigation');
   const footer = getBodySection('footer');
-  const floatingArea = useRef();
   const showScroll = isSticky(offsetTop);
 
   useEffect(() => {
@@ -61,11 +60,7 @@ function Body({ pageContext, children, hideOperatorBanner, serverData, offsetTop
       )}
       {children && <main>{children}</main>}
       <Footer template={template} section={footer} />
-      <div
-        className={styles.floatingArea}
-        style={{ display: showScroll ? 'flex' : 'none' }}
-        ref={floatingArea}
-      >
+      <div className={`${styles.floatingArea} ${showScroll ? styles.show : ''}`}>
         <ScrollToTop />
         {OperatorBanner && (
           <OperatorBanner

package/src/constants/settings.mjs

@@ -22,7 +22,7 @@ export default {
     'partnerships.gigmedia.com': ['inactive', 'blacklisted'],
     'habibibet.org': ['inactive', 'blacklisted'],
     'xn--nt-casino-v2a.se': ['inactive', 'blacklisted'],
-    'casinomobile.co.za': [],
+    'casinomobile.co.za': ['inactive', 'blacklisted'],
     'betamericalatina.com': ['inactive', 'blacklisted'],
   },
   keep_page_extra_fields: {

package/src/helpers/processor/index.mjs

@@ -115,9 +115,16 @@ export function processSections(sections, skipPost = false, page, translations,
     }
     if (sections[sectionKey] && sections[sectionKey].modules) {
       sections[sectionKey].modules.forEach((module, key) => {
-        if (shouldSavePrefilled(module, siteName) && savedModules[module.module_value_id]) {
-          Object.assign(module, savedModules[module.module_value_id]);
+        if (shouldSavePrefilled(module, siteName) && savedModules[module.value_id]) {
+          Object.assign(module, savedModules[module.value_id]);
         } else {
+          if (module.value_type === ModuleValue.VALUE_TYPE_PREFILLED_MODULE_MARKET) {
+            module = {
+              ...cloneDeep(prefilledMarketModules[module.value_id]),
+              value_type: ModuleValue.VALUE_TYPE_PREFILLED_MODULE_MARKET,
+            };
+          }
+
           processModule(
             module,
             pages,
@@ -132,8 +139,10 @@ export function processSections(sections, skipPost = false, page, translations,
             markets
           );
 
+          sections[sectionKey].modules[key] = module;
+
           if (shouldSavePrefilled(module, siteName)) {
-            savedModules[module.module_value_id] = module;
+            savedModules[module.value_id] = module;
           }
         }
       });

package/src/helpers/processor/modules.mjs

@@ -26,11 +26,11 @@ export function processCardsModule(module, pages, pagesCloned, pagesMappedById)
         module.cards_page_type !== 'operator'
           ? pagesCloned[modelType]
           : pagesCloned[modelType].filter(
-            (page) =>
-              !settings.filter_cards_modules[process.env.GATSBY_SITE_NAME].includes(
-                page.relation && page.relation.status
-              )
-          );
+              (page) =>
+                !settings.filter_cards_modules[process.env.GATSBY_SITE_NAME].includes(
+                  page.relation && page.relation.status
+                )
+            );
       module.items = sampleSize(samplePages, numOfItems);
     } else {
       module.items = pagesCloned[modelType].slice(0, numOfItems);
@@ -74,13 +74,18 @@ export function filterGames(pages, selectedCategories, selectedProviders) {
   }
 
   pages.forEach((page) => {
-    page.relation.game_categories.forEach((game) => {
-      if (selectedCategories && selectedCategories.includes(game.id)) {
+    if (selectedCategories) {
+      page.relation.game_categories.forEach((game) => {
+        if (selectedCategories.includes(game.id)) {
+          pagesFiltered.push(page);
+        }
+      });
+    }
+
+    if (selectedProviders) {
+      if (selectedProviders.includes(page.relation.game_provider.id)) {
         pagesFiltered.push(page);
       }
-    });
-    if (selectedProviders && selectedProviders.includes(page.relation.game_provider.id)) {
-      pagesFiltered.push(page);
     }
   });
 
@@ -117,16 +122,21 @@ export function filterOperators(pages, selectedProviders, selectedTypes) {
   }
 
   pages.forEach((page) => {
-    page.relation.software.forEach((software) => {
-      if (selectedProviders && selectedProviders.includes(software.id)) {
-        pagesFiltered.push(page);
-      }
-    });
-    page.relation.types.forEach((type) => {
-      if (selectedTypes && selectedTypes.includes(type)) {
-        pagesFiltered.push(page);
-      }
-    });
+    if (selectedProviders) {
+      page.relation.software.forEach((software) => {
+        if (selectedProviders.includes(software.id)) {
+          pagesFiltered.push(page);
+        }
+      });
+    }
+
+    if (selectedTypes) {
+      page.relation.types.forEach((type) => {
+        if (selectedTypes.includes(type)) {
+          pagesFiltered.push(page);
+        }
+      });
+    }
   });
 
   return filterInactiveOperators(pagesFiltered);
@@ -185,6 +195,7 @@ export function processCardsV2(module, pagesCloned, pagesMappedById, pageId) {
       const selectedCategories = module.cards_selector_filters.page_categories;
 
       const pagesFilteredByAuthor = filterPages(pagesList, selectedAuthors, 'author_id');
+
       // Filter by reviewer
       const pagesFilteredByReviewer = filterPages(
         pagesFilteredByAuthor,
@@ -205,7 +216,6 @@ export function processCardsV2(module, pagesCloned, pagesMappedById, pageId) {
       // Get limit, if not set 50 as default
       const itemLimit = module.cards_selector_filters_limit || 50;
       let finalizedFilteredPages = [];
-
       switch (cardType) {
         case 'game':
           finalizedFilteredPages = filterGames(
@@ -228,7 +238,7 @@ export function processCardsV2(module, pagesCloned, pagesMappedById, pageId) {
           finalizedFilteredPages = filteredPages;
       }
       const uniquePages = removeCurrentPage(removeDuplicates(finalizedFilteredPages, 'id'), pageId);
-
+      
       // Applying sorting
       if (sortType === 'random') {
         module.items = sampleSize(uniquePages, itemLimit);
@@ -238,6 +248,7 @@ export function processCardsV2(module, pagesCloned, pagesMappedById, pageId) {
           module.items = uniquePages.slice(0, itemLimit);
         }
       }
+     
     }
   }
 
@@ -249,7 +260,7 @@ export function processCardsV2(module, pagesCloned, pagesMappedById, pageId) {
   if (pageId !== null) {
     module.module_title = getModuleTitle(module, pagesMappedById[pageId]);
   }
-
+  
   // modify page so it doesn't have too much data
   module.items = module.items.map((item) => clonePageForCards(cloneDeep(item), module.style));
 }
@@ -273,19 +284,22 @@ export function processTopListModule(module, relations, pages, markets) {
       // Remove the ribbons if are empty, will be add ribbons from operator
       if (item.ribbons && item.ribbons.length === 0) delete item.ribbons;
       const clone = pick(cloneDeep(relations.operator[item.operator_id]), topListPickKeys);
-      
-       // refactor deposit method
-       clone.bonus.deposit_methods = clone.bonus.deposit_methods?.map(({ id, name, standardised_logo_filename }) => (
-        { id, name, standardised_logo_filename }
-        ));
 
+      // refactor deposit method
+      clone.bonus.deposit_methods = clone.bonus.deposit_methods?.map(
+        ({ id, name, standardised_logo_filename }) => ({ id, name, standardised_logo_filename })
+      );
 
       const operatorPage =
         pages && pages.operator
           ? pages.operator.filter((page) => page.relation_id === item.operator_id)
           : [];
       if (operatorPage[0]?.extra_fields) {
-        clone.reviewSummery = getExtraField(operatorPage[0]?.extra_fields, 'operator_review_summary', null);
+        clone.reviewSummery = getExtraField(
+          operatorPage[0]?.extra_fields,
+          'operator_review_summary',
+          null
+        );
       }
 
       if (operatorPage.length >= 1 && operatorPage[0].author) {
@@ -348,7 +362,9 @@ export function processModule(
   // See more link
   if (module.see_more_link?.value) {
     module.see_more_link.path =
-      module.see_more_link?.type === 'page' ? pagesMappedById[module.see_more_link.value].path : module.see_more_link?.value
+      module.see_more_link?.type === 'page'
+        ? pagesMappedById[module.see_more_link.value].path
+        : module.see_more_link?.value;
   }
 
   if (module.name === 'cards') {