gatsby-core-theme 39.0.34 → 40.0.1

package/CHANGELOG.md

@@ -1,3 +1,36 @@
+## [40.0.1](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v40.0.0...v40.0.1) (2024-10-10)
+
+
+### Bug Fixes
+
+* disquss url ([4469bd3](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/4469bd3a5061b836fd5bab62938a7107498785b6))
+
+# [40.0.0](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v39.0.34...v40.0.0) (2024-10-10)
+
+
+### Bug Fixes
+
+* added disquss ([c7998bf](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/c7998bf0379eaaac218b27411056a0fc0f7a0539))
+* added disquss ([f2dcba8](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/f2dcba8b310a61f298ab31875e76ac3647a96f22))
+* props update ([dcd8dde](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/dcd8ddeea790d5d6fa84de2b5586448d17b5043a))
+
+
+### Code Refactoring
+
+* add class to cta in content module ([acc6d23](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/acc6d23d2e7a860a5ff161a2bcd0eacc5d90f39a))
+* remove temp ([ad0b882](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/ad0b882c0c9dcf431c67d43f3859b8fef9611a4e))
+* temp ([db0d2a0](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/db0d2a0013b7efda7629f8c6c2d968a71a130a0d))
+
+
+* Merge branch 'tm-4853-disquss' into 'master' ([6c35492](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/6c35492994e40e30d2a009b56e828636bf4e4dcc))
+* Merge branch 'tm-4851-content-cta' into 'master' ([3674785](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/36747852f09fc03b31b6dbefb3f5c957dcf9f8be))
+* Merge branch 'master' into tm-4851-content-cta ([78f3323](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/78f3323db3cd299783ef2a89d7a0f8a2783ba7ed))
+
+
+### Tests
+
+* fix test ([6b7b000](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/6b7b0008f1b8b09e1852dd43f4141b58cea2538c))
+
 ## [39.0.34](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v39.0.33...v39.0.34) (2024-10-10)
 
 

package/gatsby-browser.js

@@ -124,6 +124,21 @@ const piguard = () =>{
   document.head.appendChild(script);
 }
 
+const disquss = () =>{
+   // eslint-disable-next-line no-unused-vars, func-names, camelcase
+   var disqus_config = function () {
+    this.page.url = window.location.href;
+    this.page.identifier = window.location.pathname; // Replace PAGE_IDENTIFIER with your page's unique identifier variable
+  };
+
+  var d = document,
+    s = d.createElement('script');
+  s.src = `${process.env.DISQUSS_URL}`;
+  s.id = 'disquss-code';
+  s.setAttribute('data-timestamp', +new Date());
+  (d.head || d.body).appendChild(s);
+}
+
 function scrollEvent(event) {
   initGTM();
 
@@ -131,6 +146,10 @@ function scrollEvent(event) {
     piguard();
   }
 
+  if (!document.getElementById('disquss-code')  && process.env.ENABLE_DISQUSS === 'true') {
+    disquss();
+  }
+
   if (process.env.ENABLE_MICROSOFT === 'true' && !document.getElementById('microsoft-code'))
     microsoftAdvertising();
 

package/jest.config.js

@@ -29,6 +29,7 @@ module.exports = {
     'src/components/organisms/carousel',
     'src/components/atoms/author-box',
     'src/components/pages/search',
+    'src/components/atoms/disquss',
     'src/components/app.js',
     'src/components/app-ssr.js',
   ],

package/package.json

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

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

@@ -0,0 +1,36 @@
+/* eslint-disable react-hooks/exhaustive-deps */
+/* eslint-disable react/no-this-in-sfc */
+/* eslint-disable no-undef */
+import React, { useEffect } from 'react';
+import PropTypes from 'prop-types';
+
+import { getUrl } from '~helpers/getters';
+
+const Disquss = ({page}) => {
+  useEffect(() => {
+    if (typeof DISQUS !== 'undefined') {
+      DISQUS.reset({
+        reload: true,
+        config() {
+          this.page.title = page.title;
+          this.page.url = getUrl(page.path);
+        },
+      });
+    }
+  }, []);
+
+  return (
+    <div className="module">
+      <div id="disqus_thread" />
+    </div>
+  );
+};
+
+Disquss.propTypes = {
+  page: PropTypes.shape({
+    title: PropTypes.string,
+    path: PropTypes.string
+  })
+};
+
+export default Disquss;

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

@@ -17,7 +17,7 @@ const Content = ({
   isModuleIntroduction = '',
   page,
   moduleName = 'content',
-  isContentCollapsible = true,
+  isContentCollapsible = false,
   icon = <IoIosArrowDown />,
   moduleWidth = 960,
   modulePosition,
@@ -59,7 +59,7 @@ const Content = ({
     >
       {parse(content, {
         replace: (node) =>
-          replaceMedia(node, moduleWidth, moduleName, pageTemplate, modulePosition)
+          replaceMedia(node, moduleWidth, moduleName, pageTemplate, modulePosition, styles)
       })}
     </div>
   )
@@ -84,7 +84,7 @@ const Content = ({
       `}
     >
       {parse(content, {
-        replace: (node) => replaceMedia(node, page, {}, moduleWidth)
+        replace: (node) => replaceMedia(node, page, {}, moduleWidth, styles)
       })}
     </div>
   )

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

@@ -37,6 +37,10 @@ const Main = ({
   const NotFound = page?.path?.includes("404")
     ? lazy(() => import(`~atoms/not-found`))
     : null;
+
+  const Disquss =
+    page.type === "operator" && process.env.ENABLE_DISQUSS === 'true' ? lazy(() => import(`~atoms/disquss`)) : null;
+
   const Newsletter = showNewsletter
     ? lazy(() => import("~molecules/newsletter"))
     : null;
@@ -49,7 +53,8 @@ const Main = ({
 
   return (
     <main className={styles.modulePage || ""}>
-      {section && section.modules &&
+      {section &&
+        section.modules &&
         section.modules.map((module, index) => (
           <Module
             key={keygen()}
@@ -61,6 +66,13 @@ const Main = ({
             modulePosition={index + 1}
           />
         ))}
+
+      {Disquss && (
+        <Suspense fallback={<></>}>
+          <Disquss page={pageContext.page} />
+        </Suspense>
+      )}
+
       {NotFound && (
         <Suspense fallback={<></>}>
           <NotFound pageContext={pageContext} />

package/src/helpers/replaceMedia.js

@@ -5,7 +5,12 @@ import { isTrackerLink } from 'gatsby-core-theme/src/helpers/tracker.mjs'
 import processImageNode from './processImageNode.js'
 import PrettyLink from '~atoms/pretty-link'
 
-export default (node, moduleWidth = 960, moduleName, pageTemplate, modulePosition) => {
+export default (node, moduleWidth = 960, moduleName, pageTemplate, modulePosition, styles) => {
+
+  if (node.name === 'a' && node?.attribs?.class) {
+    node.attribs.class = styles && styles[node?.attribs?.class];
+  }
+
   if (node.name === 'iframe') {
     return <Iframe src={node.attribs.src} />
   }