gatsby-core-theme 2.0.14 → 2.0.18

package/CHANGELOG.md

@@ -1,3 +1,50 @@
+## [2.0.18](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v2.0.17...v2.0.18) (2022-01-10)
+
+
+### Config
+
+* reverted gatsby upgrade ([4155578](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/415557860165a0e9fa5a327470cea2570d0d57ed))
+
+## [2.0.17](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v2.0.16...v2.0.17) (2022-01-10)
+
+
+### Bug Fixes
+
+* removing cards extra divs ([7096d88](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/7096d88b480a43d4d8bd5245cf403b07f194fae0))
+* updated html parser package ([332b237](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/332b237bc728bfe57766fab1bced598ad18ceeb6))
+
+
+### Config
+
+* updated gatsby packages ([cdfc9c3](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/cdfc9c3681db2603061b0fcc1f4ef634ce12e7a1))
+
+
+* Merge branch 'upgrade' into 'master' ([e38a936](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/e38a936bc76221072c5d0e89c66fccd3df3cbad7))
+
+## [2.0.16](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v2.0.15...v2.0.16) (2022-01-05)
+
+
+### Bug Fixes
+
+* update-placeholder-generation-with-title ([92e3cf2](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/92e3cf2663345ddaffb040504f4830d445d2f73c))
+
+
+* Merge branch 'hotfix-update-placeholder-generation-with-title' into 'master' ([44d05d6](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/44d05d648d49bdb2d5776d7133e3b569ac1f6353))
+
+## [2.0.15](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v2.0.14...v2.0.15) (2022-01-05)
+
+
+### Code Refactoring
+
+* update gatsby-node.esm page config before create pages ([1363dd6](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/1363dd6897771e29e3efea3d5afe59399791ff77))
+* update lazy picture, collapse component ([259fffb](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/259fffbc988d2caf811a594fe72e53f89d3ad2d2))
+* update meta viewport for accessibility score ([6b59e12](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/6b59e12068194701c683ef555f5ba401eee1f3bf))
+* update slider main class ([fb95afc](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/fb95afc7cfc1520d08fdad90dc38d4487fd2177a))
+
+
+* Merge branch 'hotfix-update-page-obj-before-create' into 'master' ([a2526c6](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/a2526c6926702a7ae2e392052d3b5fb965c1a560))
+* Merge branch 'tm-2567-update-theme-for-w3-validator' into 'master' ([42583d8](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/42583d876f364761e8eaf5a480989998ea700cb5))
+
 ## [2.0.14](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v2.0.13...v2.0.14) (2022-01-05)
 
 

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 { generateMetaString, generateTrackerLink } from './src/helpers/generators';
+import { generatePlaceholderString, generateTrackerLink } from './src/helpers/generators';
 import processor, { processSitemapPages } from './src/helpers/processor';
 import { pickAuthorsPageKeys } from './src/constants/pick-keys';
 
@@ -194,37 +194,45 @@ exports.createPages = async ({ actions: { createPage } }, themeOptions) => {
         const processedPage = page;
         processedPage.preconnect_links = preconnectLinks;
 
-        page.translations = {};
-
-        if (hasArchiveModule(page)) {
-          createArchivePage(page, marketSections, prefilledModules, createPage);
-          return;
-        }
-
-        if (page.type === 'event' && !page.relation.event) {
-          return;
-        }
         siteSchema = response.schema[page['market_id']];
         authors = response.authors;
+
+        page.translations = {};
         // siteSchema and authors are added to page for schemaGenerator()
         page.siteSchema = siteSchema;
         page.authors = Object.keys(authors || {}).map((key) =>
           pick(authors[key], pickAuthorsPageKeys)
         );
-        // Done for matrix-theme sites for placeholders auto update
+
+        // 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 &&
-          generateMetaString(page.meta_title, translations, {
+          generatePlaceholderString(page.meta_title, translations, {
             siteName: response.general.site_name,
             siteTitle: page.title,
           });
         page.meta_description =
           page.meta_description &&
-          generateMetaString(page.meta_description, translations, {
+          generatePlaceholderString(page.meta_description, translations, {
             siteName: response.general.site_name,
             siteTitle: page.title,
           });
 
+        if (hasArchiveModule(page)) {
+          createArchivePage(page, marketSections, prefilledModules, createPage);
+          return;
+        }
+
+        if (page.type === 'event' && !page.relation.event) {
+          return;
+        }
+
         const contextData = {
           page,
           marketSections,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-core-theme",
-  "version": "2.0.14",
+  "version": "2.0.18",
   "description": "Gatsby Theme NPM Package",
   "main": "index.js",
   "GATSBY_RECAPTCHA_SITEKEY": "6LfoyvMUAAAAAO4nl_MQnqHb4XdHxEiu5cXgIqeB",
@@ -45,7 +45,7 @@
     "gatsby-plugin-webfonts": "^2.1.0",
     "gatsby-source-filesystem": "^3.3.0",
     "gatsby-transformer-sharp": "^3.3.0",
-    "html-react-parser": "^1.2.5",
+    "html-react-parser": "^1.3.0",
     "js-search": "^2.0.0",
     "lodash": "^4.17.15",
     "node-sass": "5.0.0",

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

@@ -38,7 +38,7 @@ const Collapse = ({
 
   return (
     <div className={styles.collapseContainer}>
-      <div className={`${maxHeightStyle !== 0 ? styles.active : ''}`}>
+      <div className={maxHeightStyle !== 0 ? styles.active : null}>
         {showButton && (
           <button
             type="button"
@@ -52,7 +52,7 @@ const Collapse = ({
         )}
         <div
           ref={contentRef}
-          className={`${showButton ? styles.content : ''}`}
+          className={showButton ? styles.content : null}
           style={showButton ? { maxHeight: maxHeightStyle } : {}}
         >
           {contentText}

package/src/components/atoms/operator-info-block/operator-info-block.module.scss

@@ -31,9 +31,6 @@
     p {
       color: var(--color-22);
     }
-    .label {
-      font-size: bold;
-    }
     .value {
       font-weight: 400;
     }

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

@@ -198,7 +198,7 @@ function Slider({
             onKeyDown: () => arrowHandler('next'),
             disabled: Math.abs(state.slideIndex) === state.length - 1 && true,
           })}
-        <div className={`${styles.sliderContent}`} style={style} ref={sliderContentRef}>
+        <div className={styles.sliderContent} style={style} ref={sliderContentRef}>
           {children.map((slide, index) => (
             <div
               // eslint-disable-next-line react/no-array-index-key

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

@@ -12,6 +12,7 @@ const CardsGridStyles = ({
   mobileColumns = 2,
   tabletColumns = 3,
   desktopColumns = 4,
+  className = '',
 }) => {
   const divStyle = {
     '--cards-mob-column': `${
@@ -24,10 +25,15 @@ const CardsGridStyles = ({
       module.desktop_num_of_columns ? module.desktop_num_of_columns : desktopColumns
     }`,
   };
-  return <div style={divStyle}>{children}</div>;
+  return (
+    <div className={className} style={divStyle}>
+      {children}
+    </div>
+  );
 };
 
 CardsGridStyles.propTypes = {
+  className: PropTypes.string,
   module: PropTypes.shape({
     mobile_num_of_columns: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
     tablet_num_of_columns: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
@@ -53,25 +59,23 @@ const Cards = ({
     desktopColumns={desktopColumns}
     tabletColumns={tabletColumns}
     mobileColumns={mobileColumns}
+    className={styles.cardsContainer}
   >
-    <div className={styles.cardsContainer}>
-      {module.items &&
-        module.items.map((item, index) => (
-          <div key={keygen()}>
-            {CustomCardComponent ? (
-              <CustomCardComponent
-                featured={module.style === 'featured'}
-                item={item}
-                type={item.type}
-                number={index + 1}
-                page={page}
-              />
-            ) : (
-              <Card item={item} />
-            )}
-          </div>
-        ))}
-    </div>
+    {module.items &&
+      module.items.map((item, index) =>
+        CustomCardComponent ? (
+          <CustomCardComponent
+            key={keygen()}
+            featured={module.style === 'featured'}
+            item={item}
+            type={item.type}
+            number={index + 1}
+            page={page}
+          />
+        ) : (
+          <Card key={keygen()} item={item} />
+        )
+      )}
   </CardsGridStyles>
 );
 

package/src/helpers/generators.js

@@ -21,7 +21,7 @@ export function generateTrackerLink(operator, trackerType) {
   }
 }
 
-export function generateMetaString(metaString, translations, props) {
+export function generatePlaceholderString(string, translations, props) {
   const date = new Date();
   const day = date.getDate();
   const month = months[date.getMonth()];
@@ -29,7 +29,7 @@ export function generateMetaString(metaString, translations, props) {
   const regex =
     /\[MONTH\]|\[YEAR\]|\[currentyear\]|\[sitename\]|\[currentmonth\]|\[title\]|\[currentdate\]/gi;
 
-  return metaString.replace(
+  return string.replace(
     regex,
     (match) =>
       ({

package/src/helpers/generators.test.js

@@ -1,4 +1,4 @@
-import { generateTrackerLink, generateMetaString } from './generators';
+import { generateTrackerLink, generatePlaceholderString } from './generators';
 import { months } from '~constants/common';
 
 describe('Generate Tracker Link Helper', () => {
@@ -16,19 +16,19 @@ describe('Generate Tracker Link Helper', () => {
   });
 });
 
-describe('Generate Meta Title Helper', () => {
-  test('generateMetaString uppercase', () => {
-    const metaString = generateMetaString('meta title [MONTH] [YEAR]');
+describe('Generate Placeholders String', () => {
+  test('generatePlaceholderString uppercase', () => {
+    const string = generatePlaceholderString('Some title [MONTH] [YEAR]');
     const date = new Date();
 
-    expect(metaString).not.toContain('[MONTH]');
-    expect(metaString).not.toContain('[YEAR]');
-    expect(metaString).toContain(date.getFullYear());
-    expect(metaString).toContain(months[date.getMonth()]);
+    expect(string).not.toContain('[MONTH]');
+    expect(string).not.toContain('[YEAR]');
+    expect(string).toContain(date.getFullYear());
+    expect(string).toContain(months[date.getMonth()]);
   });
-  test('generateMetaString lowercase', () => {
-    const metaString = generateMetaString(
-      'meta title [currentdate] [currentmonth] [currentyear] [sitename] [title]',
+  test('generatePlaceholderString lowercase', () => {
+    const string = generatePlaceholderString(
+      'Some title [currentdate] [currentmonth] [currentyear] [sitename] [title]',
       null,
       {
         siteName: 'Site Name',
@@ -37,26 +37,26 @@ describe('Generate Meta Title Helper', () => {
     );
     const date = new Date();
 
-    expect(metaString).not.toContain('[currentdate]');
-    expect(metaString).not.toContain('[currentmonth]');
-    expect(metaString).not.toContain('[currentyear]');
-    expect(metaString).not.toContain('[sitename]');
-    expect(metaString).not.toContain('[title]');
-    expect(metaString).toContain(date.getDate());
-    expect(metaString).toContain(months[date.getMonth()]);
-    expect(metaString).toContain(date.getFullYear());
-    expect(metaString).toContain('Site Name');
-    expect(metaString).toContain('Site Title');
+    expect(string).not.toContain('[currentdate]');
+    expect(string).not.toContain('[currentmonth]');
+    expect(string).not.toContain('[currentyear]');
+    expect(string).not.toContain('[sitename]');
+    expect(string).not.toContain('[title]');
+    expect(string).toContain(date.getDate());
+    expect(string).toContain(months[date.getMonth()]);
+    expect(string).toContain(date.getFullYear());
+    expect(string).toContain('Site Name');
+    expect(string).toContain('Site Title');
   });
-  test('generateMetaString translated', () => {
+  test('generatePlaceholderString translated', () => {
     const translateMonths = months.reduce(
       (translated, month) => ({ ...translated, [month]: `translate${month.substring(0, 1)}` }),
       {}
     );
-    const metaString = generateMetaString('meta title [MONTH]', translateMonths);
+    const string = generatePlaceholderString('Some title [MONTH]', translateMonths);
     const date = new Date();
 
-    expect(metaString).not.toContain('[MONTH]');
-    expect(metaString).toContain(translateMonths[months[date.getMonth()]]);
+    expect(string).not.toContain('[MONTH]');
+    expect(string).toContain(translateMonths[months[date.getMonth()]]);
   });
 });

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

@@ -19,7 +19,13 @@ export default function LazyPicture({
   mobileBreakpoint = '768',
 }) {
   return (
-    <LazyLoad height={`${height}px`} width={`${width}px`} offset={offset} debounce={0}>
+    <LazyLoad
+      height={height ? `${height}px` : null}
+      width={width ? `${width}px` : null}
+      placeholder={<span className="lazyload-placeholder" />}
+      offset={offset}
+      debounce={0}
+    >
       <picture className={className}>
         {webp && <source srcSet={webp} type="image/webp" />}
         {mobileSrc && desktopSrc && (