gatsby-core-theme 2.1.0 → 2.2.0

package/CHANGELOG.md

@@ -1,3 +1,43 @@
+# [2.2.0](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v2.1.0...v2.2.0) (2022-01-18)
+
+
+### Bug Fixes
+
+* add track background color ([8886659](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/888665908dc7a97e008d42321e1a61482d1d31d8))
+* add variable  thumb-color ([7d0d1da](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/7d0d1da9f6244573fa38dca0fbc463ceb0e5840d))
+* dmca ([a320701](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/a320701a80b61e1a354fcc295f531d763b683261))
+* fixes ([3886daf](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/3886daf5e8771ae69e4379a440ed944b23d39ae6))
+* menu item, cards row gap ([6fca1e4](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/6fca1e4f9117bd0d84c143ba57eb0531b467327b))
+* menu item, cards row gap ([cd319ca](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/cd319ca0f4efa1845e5cf2df1e22644dd366e312))
+* placeholder ([8c9b5bd](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/8c9b5bdaef7173406689e3e210e586b237d46ba3))
+* relocate placeholders to processor ([96c17f6](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/96c17f636abc652013d0bf396b3a496a167748ea))
+* removed slider from anchor module ([185975f](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/185975f75a3f6a592a4477d772ccf148e17e07ce))
+* small fixes ([cc29dfa](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/cc29dfa365105bbaae1b14c0b9641d2d936c1ffe))
+* use generateplaceholder for sitemap titles ([9e3ef4e](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/9e3ef4ee5f8f0c5dff129f2da8a50f3997215feb))
+
+
+### Code Refactoring
+
+* move replacePlaceholder to gatsby node esm ([9eb9d84](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/9eb9d842f2ef1496550348a502d1323ce1552475))
+* update counter li key prop ([8796b36](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/8796b361618e44347e1250943e2d31a6b8977b09))
+* update generators tests ([39dd1f5](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/39dd1f5e24f7e79abbaf98793be83ede80ca7a14))
+* update placeholder generation in gatsby-node.esm, processSitemapPages and generatePlaceholderString ([52ae3fe](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/52ae3fe551d4520296be05302df58a1880f46970))
+* update processSitemapPages for tests and remove generatePlaceholderString import ([3b73cb8](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/3b73cb84a2d4d00ceb625aa0f21a4416990dfc34))
+* update siteInfo check for node process ([6940762](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/69407626dda1f4541b86589c2f738929363ddb09))
+
+
+* Merge branch 'tm-2625-dmca' into 'master' ([d75e192](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/d75e1927e5c8eac06426c43b5e18396202359b72))
+* Merge branch 'tm-2654-minor-fixes' into 'master' ([d207bd6](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/d207bd6a376d390714c157f82f98ccdca3334844))
+* Merge branch 'tm-2656-placeholder' into 'master' ([92d1b1b](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/92d1b1b36f733f9b880750b36aa710bd5bba536a))
+* Merge branch 'tm-2557-cards-v2-changes' into 'master' ([bd5c28f](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/bd5c28f764cb38a949d0638d6bf4782a7ad9de14))
+* Merge branch 'tm-2655-anchor-module' into 'master' ([4748e7a](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/4748e7a8458003eea7c8dd0c163fb338dcd2f173))
+* Merge branch 'tm-2656-fix-placeholders' into 'master' ([b8a06f3](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/b8a06f3cc24fc39df0ca949c404c41ed69a13ad8))
+
+
+### Features
+
+* cards v2 filters cvhanges ([b0f3a96](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/b0f3a96cc784fcf432cee9c14b63574df362e05f))
+
 # [2.1.0](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v2.0.19...v2.1.0) (2022-01-13)
 
 

package/gatsby-node.esm.js

@@ -5,7 +5,7 @@
 import { cloneDeep, chunk, pick } from 'lodash';
 import chalk from 'chalk';
 import { getData, getLocalData } from './src/helpers/api';
-import { generatePlaceholderString, generateTrackerLink } from './src/helpers/generators';
+import { generateTrackerLink } from './src/helpers/generators';
 import processor, { processSitemapPages } from './src/helpers/processor';
 import { pickAuthorsPageKeys } from './src/constants/pick-keys';
 
@@ -150,13 +150,13 @@ exports.createPages = async ({ actions: { createPage } }, themeOptions) => {
   // add data to modules
   const processed = processor.run(response, themeOptions, fs);
   pages = processed.pages;
-  htmlSitemapPages = processSitemapPages(pages, processed.site_markets);
   siteInfo = processed.general;
   operators = processed.relations.operator;
   templates = processed.templates;
   // eslint-disable-next-line prefer-destructuring
   languageKey = Object.keys(processed.relations.translations)[0];
   translations = processed.relations.translations[languageKey];
+  htmlSitemapPages = processSitemapPages(pages, processed.site_markets);
 
   if (themeOptions.siteType === 'sport') {
     sports = Object.keys(response.relations['sports_data'].sports).map(
@@ -204,26 +204,6 @@ exports.createPages = async ({ actions: { createPage } }, themeOptions) => {
           pick(authors[key], pickAuthorsPageKeys)
         );
 
-        // replacing string placehoders with year, month, date, etc.
-        page.title =
-          page.title &&
-          generatePlaceholderString(page.title, translations, {
-            siteName: response.general.site_name,
-            siteTitle: page.title,
-          });
-        page.meta_title =
-          page.meta_title &&
-          generatePlaceholderString(page.meta_title, translations, {
-            siteName: response.general.site_name,
-            siteTitle: page.title,
-          });
-        page.meta_description =
-          page.meta_description &&
-          generatePlaceholderString(page.meta_description, translations, {
-            siteName: response.general.site_name,
-            siteTitle: page.title,
-          });
-
         if (hasArchiveModule(page)) {
           createArchivePage(page, marketSections, prefilledModules, createPage);
           return;

package/package.json

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

package/src/components/atoms/disclaimer/disclaimer.test.js

@@ -15,8 +15,8 @@ const dmcaImg = (
 describe('Disclaimer Component', () => {
   test('render disclaimer badge', () => {
     const { container } = render(<Disclaimer image={dmcaImg} />);
-    expect(container.querySelectorAll('.lazyload-placeholder')).toHaveLength(1);
-    expect(container.querySelector('div')).toBeTruthy();
+    expect(container.querySelectorAll('a')).toHaveLength(1);
+    expect(container.querySelectorAll('img')).toHaveLength(1);
   });
 });
 afterEach(() => {

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

@@ -1,21 +1,42 @@
-import React from 'react';
+/* eslint-disable no-return-assign */
+/* eslint-disable no-plusplus */
+/* eslint-disable no-var */
+import React, { useRef } from 'react';
 import PropTypes from 'prop-types';
-import LazyLoad from 'react-lazyload';
 
-const Disclaimer = ({ image }) => (
-  <LazyLoad>
-    <a
-      href="//www.dmca.com/Protection/Status.aspx?ID=9e466e76-827d-4247-ac51-4eb75b227301"
-      title="DMCA.com Protection Status"
-      className="dmca-badge"
-      target="_blank"
-      rel="noreferrer"
-    >
-      {image}
-    </a>
-    <script src="https://images.dmca.com/Badges/DMCABadgeHelper.min.js"> </script>
-  </LazyLoad>
-);
+const Disclaimer = ({ image }) => {
+  const anchorElement = useRef(null);
+
+  function dmca() {
+    document.addEventListener(
+      'click',
+      () => {
+        const element = anchorElement.current;
+        if (element.getAttribute('href').indexOf('refurl') < 0) {
+          element.href = `${`${
+            element.href + (element.href.indexOf('?') === -1 ? '?' : '&')
+          }refurl`}=${document.location}`;
+        }
+      },
+      false
+    );
+  }
+
+  return (
+    <>
+      <a
+        ref={anchorElement}
+        onClick={dmca}
+        href="//www.dmca.com/Protection/Status.aspx?ID=9e466e76-827d-4247-ac51-4eb75b227301"
+        title="DMCA.com Protection Status"
+        target="_blank"
+        rel="noreferrer"
+      >
+        {image}
+      </a>
+    </>
+  );
+};
 
 export default Disclaimer;
 

package/src/components/atoms/menu/items/item/index.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-nested-ternary */
 import React, { useState, useEffect, useContext } from 'react';
 import PropTypes from 'prop-types';
 import Link from '~hooks/link';
@@ -63,7 +64,7 @@ export default function Item({
       {item.value?.includes('http') || item.value?.includes('www') ? (
         <a
           aria-label={`${item?.title} link`}
-          href={item.value}
+          href={item.value ? item.value : '#'}
           title={item.title}
           rel={`noreferrer ${item.nofollow && 'nofollow'}`}
           target="_blank"
@@ -78,7 +79,7 @@ export default function Item({
           <ItemImage />
           {item.title}
         </a>
-      ) : (
+      ) : item.value !== null ? (
         <Link
           className={`${gtmClass} ${styles.item} ${opened && styles.openedLink} ${active} ${
             !options.mobile.subMenuDropDownButton && isMobile && hasChildren
@@ -87,7 +88,8 @@ export default function Item({
           } ${hasChildren ? styles.hasChildren : ''} ${
             !options.mobile.subMenuDropDownButton ? styles.noDropDownButton : ''
           }`}
-          to={item.value ? item.value : '#'}
+          disabled={item.value === null}
+          to={item.value}
           title={item.title}
           rel={item.nofollow && 'nofollow'}
           aria-label={`${item?.title} link`}
@@ -96,6 +98,8 @@ export default function Item({
           <ItemImage />
           {item.title}
         </Link>
+      ) : (
+        <div className={styles.item}>{item.title}</div>
       )}
       {options.mobile.subMenuDropDownButton && isMobile && hasChildren && (
         <button

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

@@ -15,8 +15,8 @@ const Counter = ({ module }) => (
     <ul className={styles.counter}>
       {module.items.map((item) => {
         return (
-          <li>
-            <CounterItem data={item} key={keygen()} />;
+          <li key={keygen()}>
+            <CounterItem data={item} />;
           </li>
         );
       })}

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

@@ -1,13 +1,26 @@
-.sliderWrapper {
+.anchor {
+  @include flex-direction(row);
+  &::-webkit-scrollbar {
+    height: 0.5rem;
+  }
+  &::-webkit-scrollbar-track {
+    background: var(--anchor-track-color);
+  }
+  &::-webkit-scrollbar-thumb {
+    background: var(--anchor-thumb-color);
+  }
+  overflow-x: scroll;
   .link {
     word-break: inherit;
     white-space: nowrap;
-
+    margin-bottom: 0.5rem;
     background-color: var(--color-7);
     padding: 1rem 2.5rem;
     border-radius: 0.6rem;
     color: #000;
     font-weight: 400;
+    margin-right: 1.6rem;
+    margin-bottom: 0.5rem;
 
     &:hover {
       background-color: var(--secondary-color);
@@ -15,10 +28,10 @@
     }
   }
 }
-.storyDivs{
+.storyDivs {
   width: 100%;
   display: block;
   margin: 3rem 0;
   background-color: #eee;
   padding: 2rem;
-}
+}

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

@@ -1,12 +1,11 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-import Slider from '~molecules/slider';
 import keygen from '~helpers/keygen';
 import { anchorLink } from '~helpers/strings';
 import styles from './anchor.module.scss';
 
-function Anchor({ module: { items }, headerOffset = 80, sliderGap = 0 }) {
+function Anchor({ module: { items }, headerOffset = 80 }) {
   const handleClick = (event) => {
     event.preventDefault();
     const scrollToElementId = event.currentTarget.getAttribute('href').replace('#', '');
@@ -23,13 +22,7 @@ function Anchor({ module: { items }, headerOffset = 80, sliderGap = 0 }) {
   };
 
   return (
-    <Slider
-      useArrows={false}
-      usePagination={false}
-      settings={{ numberOfSlides: 0, sliderGap }}
-      className={styles.sliderWrapper}
-      gtmClass="anchor-carousel-gtm"
-    >
+    <div className={styles.anchor} gtmClass="anchor-carousel-gtm">
       {items.map((anchor) => (
         <a
           className={`${styles.link} anchor-carousel-gtm anchor-menu-gtm`}
@@ -40,7 +33,7 @@ function Anchor({ module: { items }, headerOffset = 80, sliderGap = 0 }) {
           {anchor?.label}
         </a>
       ))}
-    </Slider>
+    </div>
   );
 }
 
@@ -53,7 +46,6 @@ Anchor.propTypes = {
     ),
   }).isRequired,
   headerOffset: PropTypes.number.isRequired,
-  sliderGap: PropTypes.number,
   styles: PropTypes.shape({}),
 };
 

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

@@ -13,6 +13,8 @@
     grid-template-columns: repeat(var(--cards-desktop-column), minmax(0,1fr));
   }
   column-gap: 0.8rem;
+  row-gap: 1rem;
+
   @include min(desktop) {
     column-gap: 1.6rem;
   }

package/src/helpers/generators.js

@@ -21,7 +21,7 @@ export function generateTrackerLink(operator, trackerType) {
   }
 }
 
-export function generatePlaceholderString(string, translations, props) {
+export function generatePlaceholderString(string = '', translations, data) {
   const date = new Date();
   const day = date.getDate();
   const month = months[date.getMonth()];
@@ -38,8 +38,8 @@ export function generatePlaceholderString(string, translations, props) {
         '[currentdate]': `${(translations && translations[month]) || month} ${day}, ${year}`,
         '[currentmonth]': (translations && translations[month]) || month,
         '[currentyear]': year,
-        '[sitename]': (props && props.siteName) || '',
-        '[title]': (props && props.siteTitle) || '',
+        '[sitename]': (data && data.siteName) || '',
+        '[title]': (data && data.pageTitle) || '',
       }[match])
   );
 }

package/src/helpers/generators.test.js

@@ -32,7 +32,7 @@ describe('Generate Placeholders String', () => {
       null,
       {
         siteName: 'Site Name',
-        siteTitle: 'Site Title',
+        pageTitle: 'Site Title',
       }
     );
     const date = new Date();

package/src/helpers/processor/common.js

@@ -4,7 +4,7 @@ import settings from '../../constants/settings';
 // eslint-disable-next-line import/no-cycle
 import { processExtraFields } from '.';
 
-export function groupBy(list, keyName = 'author_id', single = false) {
+export function groupBy(list = {}, keyName = 'author_id', single = false) {
   const newObj = Object.values(list).reduce((acc, currentVal) => {
     if (!acc[currentVal[keyName]]) {
       acc[currentVal[keyName]] = [];

package/src/helpers/processor/index.js

@@ -8,7 +8,7 @@ import chalk from 'chalk';
 import ModuleValue from '../../constants/module-value';
 import SearchTypesEnable from '../../constants/search-types-enable';
 import { pickHTMLSitemapPageKeys } from '../../constants/pick-keys';
-
+import { generatePlaceholderString } from '../generators';
 // eslint-disable-next-line import/no-cycle
 import { processModule } from './modules';
 // eslint-disable-next-line import/no-cycle
@@ -131,6 +131,31 @@ export function processExtraFields(extraFields) {
   });
 }
 
+function updatePlaceholders(page, data) {
+  const languageKey = Object.keys(data.relations.translations)[0];
+  const translations = data.relations.translations[languageKey];
+
+  // replacing string placehoders with year, month, date, etc.
+  page.title =
+    page.title &&
+    generatePlaceholderString(page.title, translations, {
+      siteName: data.general.site_name,
+      siteTitle: page.title,
+    });
+  page.meta_title =
+    page.meta_title &&
+    generatePlaceholderString(page.meta_title, translations, {
+      siteName: data.general.site_name,
+      siteTitle: page.title,
+    });
+  page.meta_description =
+    page.meta_description &&
+    generatePlaceholderString(page.meta_description, translations, {
+      siteName: data.general.site_name,
+      siteTitle: page.title,
+    });
+}
+
 export default {
   run(data, themeOptions, fs) {
     const start = new Date();
@@ -163,6 +188,7 @@ export default {
         transformedPages[market][pageType].forEach((page, index) => {
           // process page extra fields
           processExtraFields(page.extra_fields);
+          updatePlaceholders(page, data);
 
           // set page relation
           if (

package/src/helpers/processor/modules.js

@@ -114,19 +114,25 @@ export function processCardsV2(module, pagesCloned, pagesMappedById) {
       pagesMappedById[page_id] && module.items.push(pagesMappedById[page_id]);
     });
   } else if (cardSelector === 'use_filters') {
-    // Get all pages by the selected page type
-    const pagesGroupedByType = pagesCloned[pageType];
+    let pagesList = [];
 
-    // Grouping pages by template ID
-    if (!pagesGroupedByTemplateId[pageType]) {
-      pagesGroupedByTemplateId[pageType] = groupBy(pagesGroupedByType, 'template_id');
-    }
+    if (pageType) {
+      // Get all pages by the selected page type
+      const pagesGroupedByType = pagesCloned[pageType];
+
+      // Grouping pages by template ID
+      if (!pagesGroupedByTemplateId[pageType]) {
+        pagesGroupedByTemplateId[pageType] = groupBy(pagesGroupedByType, 'template_id');
+      }
 
-    // Populate pagesList if page type and template exists
-    const pagesList =
-      !pagesGroupedByTemplateId[pageType] || !pagesGroupedByTemplateId[pageType][pageTemplateId]
-        ? []
-        : pagesGroupedByTemplateId[pageType][pageTemplateId];
+      // Populate pagesList if page type and template exists
+      pagesList =
+        !pagesGroupedByTemplateId[pageType] || !pagesGroupedByTemplateId[pageType][pageTemplateId]
+          ? []
+          : pagesGroupedByTemplateId[pageType][pageTemplateId];
+    } else {
+      pagesList = pagesMappedById.map((page) => page);
+    }
 
     // Check if there are pages before starting filtering
     if (pagesList.length > 0) {