gatsby-core-theme 11.0.4 → 11.0.7

package/CHANGELOG.md

@@ -1,3 +1,47 @@
+## [11.0.7](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v11.0.6...v11.0.7) (2022-09-12)
+
+
+### Bug Fixes
+
+* add style for link sitemap ([d9f1c9b](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/d9f1c9bafe5ba9861c0bde30dbebda83b8e0915b))
+* added checks to prevent useless p and div elements ([85e2197](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/85e2197b7dc8d5bedf5c9ce9d9fb0b3f1efa4ae5))
+* remove cache ([e973acd](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/e973acdaac3fd6e81785631957ded2265e3adcf4))
+* sitemap span style ([c421c88](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/c421c880339d6cc1f02a64e3561977ca8b4fe676))
+* sitemap style ([246b6c6](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/246b6c639c82a9db26851a67396a3d7cdc6ffe29))
+* spotlight buttons ([7d06a40](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/7d06a4030033f6e80de5a34d7ff15e5cab2d2540))
+* the external link spotlights bug ([0162af5](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/0162af5db9d5c9c092deabebbf6124570ed48f4b))
+
+
+* Merge branch 'sitemap-style' into 'master' ([821234b](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/821234b22fe13324901f4a59fc00d1e2516b81a7))
+* Merge branch 'sitemap-style' into 'master' ([7fef715](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/7fef7153121ad4fcb76fc84d4ef0f0eeff76d6d3))
+* Merge branch 'spotlights-bug' into 'master' ([ed68b36](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/ed68b3670a4d4841426e8f1beb4fbfc8883f69c7))
+* Merge branch 'tm-3042-favicon' into 'master' ([237bb9d](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/237bb9dbed6af789d097383cc9fc9aa13c3c1cac))
+* Merge branch 'sitemap-style' into 'master' ([0508ad6](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/0508ad6b9c1ea34ef5e6876ccaa52b6364e1c378))
+
+## [11.0.6](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v11.0.5...v11.0.6) (2022-09-02)
+
+
+### Bug Fixes
+
+* update button and author-box ([3eec6da](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/3eec6da80b37568a47ead1a15ad1811612b10828))
+* update button component ([60cd4d1](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/60cd4d1148517bdd4ef51cc265561b8137cfdcfa))
+* update button component in order to accept props ([25cc1e3](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/25cc1e31df9e468be966e3b1a7414e84dc5bace3))
+
+
+* Merge branch 'tm-3024-contact-us' into 'master' ([46e0b23](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/46e0b238e9c0c4da12a90c2dd072e6fc0fb039c7))
+
+## [11.0.5](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v11.0.4...v11.0.5) (2022-08-31)
+
+
+### Bug Fixes
+
+* added placeholders for cards v2 module title ([d2ec6d7](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/d2ec6d7a05ab6efa4e55378e4fd40401c06e290a))
+* removed log ([49b46e5](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/49b46e55cad7686151b4bfdd4f70076d3078f370))
+* tests ([85dcc20](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/85dcc20c53a4ca8b7dd82624bdb226037190ab8e))
+
+
+* Merge branch 'tm-2998-cardsv2-title-placeholders' into 'master' ([4dc5b17](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/4dc5b1730b5c70d618a52929cf81610ee9044e82))
+
 ## [11.0.4](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v11.0.3...v11.0.4) (2022-08-29)
 
 

package/gatsby-config.js

@@ -33,6 +33,7 @@ module.exports = {
         display: `standalone`,
         icon: `src/images/favicon.png`,
         crossOrigin: `use-credentials`,
+        cache_busting_mode: `none`,
         icons: [
           {
             src: `/favicon.ico`,

package/package.json

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

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

@@ -9,7 +9,7 @@ import PropTypes from 'prop-types';
 import { translate, imagePrettyUrl, getAltText } from '~helpers/getters';
 import styles from './author-box.module.scss';
 import LazyImage from '~hooks/lazy-image';
-import Link from '~hooks/link';
+import Button from '~atoms/button';
 import { Context } from '~context/TranslationsProvider';
 
 export default function AuthorBox({ author, preElement = null }) {
@@ -35,72 +35,77 @@ export default function AuthorBox({ author, preElement = null }) {
             />
           )}
           <span className={styles.name}>{author.name}</span>
-          <p className={styles.title}>{author.author_title}</p>
+          {author.author_title && <p className={styles.title}>{author.author_title}</p>}
         </div>
         <div className={styles.description}>
           <div className={styles.links}>
-            <p className={styles.contactLinks}>
-              {author.email_address && (
-                <a
-                  href={`mailto:${author.email_address}`}
-                  className="author-gtm"
-                  target="_blank"
-                  rel="nofollow noreferrer"
-                >
-                  {translate(translations, 'email', 'Email')}
-                </a>
-              )}
-              {author.personal_website && (
-                <a
-                  href={author.personal_website}
-                  className="author-gtm"
-                  target="_blank"
-                  rel="nofollow noreferrer"
-                >
-                  {translate(translations, 'website', 'Website')}
-                </a>
-              )}
-              {author.additional_url && (
-                <a
-                  href={author.additional_url}
-                  className="author-gtm"
-                  target="_blank"
-                  rel="nofollow noreferrer"
-                >
-                  {translate(translations, 'contact', 'Contact')}
-                </a>
-              )}
-            </p>
-            <p className={styles.socialIcons}>
-              {socialLinks
-                .filter((socialLink) => socialLink.link)
-                .map((filteredLinks) => (
-                  // eslint-disable-next-line jsx-a11y/control-has-associated-label
+            {(author.email_address || author.personal_website || author.additional_url) && (
+              <p className={styles.contactLinks}>
+                {author.email_address && (
                   <a
-                    href={filteredLinks.link}
+                    href={`mailto:${author.email_address}`}
                     className="author-gtm"
                     target="_blank"
                     rel="nofollow noreferrer"
-                    key={`author-box-link-${filteredLinks.id}`}
-                    aria-label={`${filteredLinks.id} Link`}
                   >
-                    {filteredLinks.icon}
+                    {translate(translations, 'email', 'Email')}
                   </a>
-                ))}
-            </p>
+                )}
+                {author.personal_website && (
+                  <a
+                    href={author.personal_website}
+                    className="author-gtm"
+                    target="_blank"
+                    rel="nofollow noreferrer"
+                  >
+                    {translate(translations, 'website', 'Website')}
+                  </a>
+                )}
+                {author.additional_url && (
+                  <a
+                    href={author.additional_url}
+                    className="author-gtm"
+                    target="_blank"
+                    rel="nofollow noreferrer"
+                  >
+                    {translate(translations, 'contact', 'Contact')}
+                  </a>
+                )}
+              </p>
+            )}
+            {socialLinks.length > 0 && (
+              <p className={styles.socialIcons}>
+                {socialLinks
+                  .filter((socialLink) => socialLink.link)
+                  .map((filteredLinks) => (
+                    // eslint-disable-next-line jsx-a11y/control-has-associated-label
+                    <a
+                      href={filteredLinks.link}
+                      className="author-gtm"
+                      target="_blank"
+                      rel="nofollow noreferrer"
+                      key={`author-box-link-${filteredLinks.id}`}
+                      aria-label={`${filteredLinks.id} Link`}
+                    >
+                      {filteredLinks.icon}
+                    </a>
+                  ))}
+              </p>
+            )}
             <div
               className={styles.biography}
               dangerouslySetInnerHTML={{ __html: author.biography }}
             />
           </div>
           {author.profile_page_path && (
-            <Link
+            <Button
+              primaryColor={false}
               to={author.profile_page_path}
-              title="Read More"
+              btnText="Read More"
               className={`${styles.button} author-gtm`}
             >
               {translate(translations, 'read_more', 'Read More')}
-            </Link>
+            </Button>
           )}
         </div>
       </div>

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

@@ -18,6 +18,7 @@ function Button({
   disabled = false,
   tertiary = false,
   noStyle = false,
+  icon = null,
   gtmClass = '',
 }) {
   const classes = `${styles.ctaBtn} ${primaryColor ? styles.primary : styles.secondary} ${
@@ -37,6 +38,7 @@ function Button({
         disabled={disabled}
       >
         {btnText}
+        {icon && icon}
       </button>
     );
   }
@@ -45,6 +47,7 @@ function Button({
     return (
       <Link className={`${classes} ${gtmClass}`} to={to} title={btnTitle} aria-label={btnTitle}>
         {btnText}
+        {icon && icon}
       </Link>
     );
   }
@@ -60,12 +63,14 @@ function Button({
       rel="nofollow noreferrer"
     >
       {btnText}
+      {icon && icon}
     </a>
   );
 }
 
 Button.propTypes = {
   to: PropTypes.string,
+  icon: PropTypes.func,
   btnText: PropTypes.oneOfType([PropTypes.string, PropTypes.any]),
   primaryColor: PropTypes.bool,
   invertColors: PropTypes.bool,

package/src/components/atoms/sitemap/sitemap.module.scss

@@ -47,7 +47,7 @@
         text-transform: capitalize;
       }
 
-      > div { 
+      > div {
         position: relative;
         display: flex;
         align-items: center;
@@ -55,7 +55,7 @@
         span {
           @include flex-align(center, center);
           position: absolute;
-          top: -1.2rem;
+          top: var(--sitemap-span-top, -1.2rem);
           background-color: var(--page-number-background, green);
           border-radius: 1.2rem;
           border: var(--page-number-border, 0.2rem solid white);
@@ -63,8 +63,8 @@
           font-size: 1rem;
           color: var(--page-number-color, white);
           font-weight: 700;
-          width: 2.4rem;
-          height: 2.4rem;
+          width: var(--sitemap-span-width, 2.4rem);
+          height: var(--sitemap-span-height, 2.4rem);
           left: 3.2rem;
         }
       }
@@ -78,7 +78,7 @@
 
       &:before {
         content: ' ';
-        border-left: var(--sitemap-connector-border,dashed 1px #e3e6ef);
+        border-left: var(--sitemap-connector-border, dashed 1px #e3e6ef);
         left: 0;
         position: absolute;
         top: 0;
@@ -89,8 +89,8 @@
       li {
         display: grid;
         grid-template-columns: 0.1fr 1fr;
-        gap: 0.5rem;
-        padding-bottom: 1rem;
+        gap: var(--sitemap-gap, 0.5rem);
+        padding-bottom: var(--sitemap-padding-bottom, 1rem);
         position: relative;
 
         &:before {
@@ -104,7 +104,7 @@
 
         &:after {
           content: ' ';
-          border-left: var(--sitemap-connector-border,dashed 1px #e3e6ef);
+          border-left: var(--sitemap-connector-border, dashed 1px #e3e6ef);
           left: -2.7rem;
           position: absolute;
           top: 0;
@@ -112,6 +112,10 @@
           bottom: 0;
         }
 
+        &:last-child {
+          padding-bottom: var(--sitemap-last-child-padding, 1rem);
+        }
+
         &:last-child:after {
           content: ' ';
           bottom: auto;
@@ -128,7 +132,9 @@
         }
 
         a {
+          color: var(--sitemap-link-text-color, #295dd6);
           padding-left: 0.3rem;
+          font-size: var(--sitemap-link-font-size, 1.6rem);
           font-weight: var(--sitemap-link-text-font-weight, normal);
           text-decoration: var(--sitemap-link-text-decoration, none);
         }

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

@@ -4,7 +4,6 @@
 /* eslint-disable camelcase */
 import React from 'react';
 import PropTypes from 'prop-types';
-import { GrFormNextLink } from '@react-icons/all-files/gr/GrFormNextLink';
 import Button from '~atoms/button';
 import imgSize from '~constants/spotlight-image-dimensions.js';
 import LazyImage from '~hooks/lazy-image';
@@ -85,29 +84,16 @@ const Spotlights = ({ module, themeStyles = {} }) => {
               (item.link && item.link.value ? (
                 <div className={styles.spotlightsTextCTA}>
                   {item?.text && <div dangerouslySetInnerHTML={{ __html: item.text }} />}
-                  {item.link.type === 'external' ? (
-                    <a
-                      href={item.link.value}
-                      title={item.label}
-                      target="_blank"
-                      rel="noreferrer"
-                      className="spotlights-gtm"
-                    >
-                      {item.link_text ? item.link_text : 'Read More'}
-                      <GrFormNextLink />
-                    </a>
-                  ) : (
-                    <Button
-                      btnText={item.link_text ? item.link_text : 'Read More'}
-                      invertColors
-                      isAnchorLink
-                      isInternalLink={item.link.type !== 'external'}
-                      targetBlank={item.link.type === 'external'}
-                      to={item.link.value}
-                      primaryColor={false}
-                      gtmClass="spotlights-gtm btn-cta"
-                    />
-                  )}
+                  <Button
+                    to={item.link.value}
+                    isAnchorLink
+                    isInternalLink={!(item.link.type === 'external')}
+                    rel={item.link.type === 'external' ? 'noreferrer' : ''}
+                    invertColors
+                    primaryColor={false}
+                    gtmClass="spotlights-gtm"
+                    btnText={item.link_text ? item.link_text : 'Read More'}
+                  />
                 </div>
               ) : (
                 item.text && <div dangerouslySetInnerHTML={{ __html: item.text }} />

package/src/helpers/getters.js

@@ -374,6 +374,16 @@ export function shiftFirstOperator(pageId, module, pagesMappedById) {
   }
 }
 
+export const getModuleTitle = (module, page) => {
+  if (page && page.type === 'operator') {
+    return (
+      module.module_title && module.module_title.replace('[operator_name]', page.relation.name)
+    );
+  }
+
+  return module.title;
+};
+
 export const getRoundMinutes = (time) => {
   const [minutes, seconds] = time.split(':');
   const value = seconds > 30 ? Number(minutes) + 1 : Number(minutes);

package/src/helpers/getters.test.js

@@ -29,6 +29,15 @@ describe('Getters Helper', () => {
     expect(Getters.getExtraField({ name: 'foo' }, 'name', 'def')).toEqual('foo');
   });
 
+  test('getModuleTitle()', () => {
+    expect(
+      Getters.getModuleTitle(
+        { module_title: 'Test [operator_name] test' },
+        { type: 'operator', relation: { name: 'test name' } }
+      )
+    ).toEqual('Test test name test');
+  });
+
   test('getSection()', () => {
     expect(Getters.getSection('short_code', { page: {}, marketSections: {} })).toBeNull();
     expect(

package/src/helpers/processor/modules.js

@@ -5,7 +5,7 @@ import { clonePageForCards, groupBy, removeDuplicates } from './common';
 import settings from '../../constants/settings';
 import ModuleValue from '../../constants/module-value';
 import { topListPickKeys } from '../../constants/pick-keys';
-import { shiftFirstOperator } from '../getters';
+import { shiftFirstOperator, getModuleTitle } from '../getters';
 import { generatePlaceholderString } from '../generators';
 
 const pagesGroupedByTemplateId = [];
@@ -223,6 +223,11 @@ export function processCardsV2(module, pagesCloned, pagesMappedById, pageId) {
     shiftFirstOperator(pageId, module, pagesMappedById);
   }
 
+  // Check for module title placeholders
+  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));
 }