gatsby-matrix-theme 9.0.0 → 9.0.2

package/CHANGELOG.md

@@ -1,3 +1,35 @@
+## [9.0.2](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/compare/v9.0.1...v9.0.2) (2022-11-07)
+
+
+### Bug Fixes
+
+* horse calculator styling ([124798a](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/124798aba7dd1b89086e8a901373ce5417c2ce17))
+* updaet date ([58e2916](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/58e29166ebdc5ac4262362c36962aaa32f33de7c))
+* updated to latest core version ([42998d1](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/42998d1e7a291cbfe0a090b71efa7dd69f23a79b))
+
+
+* Merge branch 'master' of git.ilcd.rocks:team-floyd/themes/matrix-theme ([e003101](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/e0031010e5aed9304d06051a71dd74e2f2e35537))
+* Merge branch 'tm-3061-update-date' into 'master' ([26a28f0](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/26a28f086f9be1f111831f2df8b77c4f0aac6656))
+
+## [9.0.1](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/compare/v9.0.0...v9.0.1) (2022-11-03)
+
+
+### Bug Fixes
+
+* added props ([4255f20](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/4255f208c9c93921c1753b0b5d4f08e0b14575a7))
+* moduel title ([37e2bb9](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/37e2bb9dfdc05371fd8bdd6c7c2470af8805c798))
+* module title ([e0ddc21](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/e0ddc2198a54c781c04fe45f85f74641632e840e))
+* module title matrix ([7a3f9fe](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/7a3f9fe928412651626c487aafb83f392e5641e2))
+* removed margin/padding tops added margin/padding bottom ([584844d](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/584844d1fbc2c19cb6adb6a160a95026b0b2a10a))
+* removed some conditions ([8c0bda6](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/8c0bda6785f17f84d0adb56501a6514f2b1256ae))
+* typo ([1d60a2a](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/1d60a2a9e7249a2e5af3782ff78fcca0cf2e983b))
+* updated to latest core version ([80ef3d7](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/80ef3d73c07697615a35e53ccda1c32ae89c31f7))
+
+
+* Merge branch 'master' of git.ilcd.rocks:team-floyd/themes/matrix-theme ([3eca20e](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/3eca20e1bd73dbd08e638588bd31d1b9d34eb247))
+* Merge branch 'tm-3062-module-top-bottom-spacing' into 'master' ([7228573](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/7228573261deab4a0804e6cadb1e55a1b9ff8842))
+* Merge branch 'tm-3050-module-title-matrix' into 'master' ([0b83460](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/0b83460e911740d37f6d9ba1e0fc32c65a71a95e))
+
 # [9.0.0](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/compare/v8.0.8...v9.0.0) (2022-11-02)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-matrix-theme",
-  "version": "9.0.0",
+  "version": "9.0.2",
   "main": "index.js",
   "description": "Matrix Theme NPM Package",
   "author": "",
@@ -24,7 +24,7 @@
   },
   "dependencies": {
     "gatsby": "^4.20.0",
-    "gatsby-core-theme": "14.0.1",
+    "gatsby-core-theme": "14.0.3",
     "gatsby-plugin-sharp": "^4.10.2",
     "gatsby-plugin-sitemap": "^3.3.0",
     "gatsby-transformer-sharp": "^4.10.0",

package/src/components/atoms/cards/article-card/index.js

@@ -18,7 +18,7 @@ import BaseCard from '../base-card';
 import styles from './article-card.module.scss';
 
 const ArticleCard = ({ item, width, height, authorImage = false }) => {
-  const { author, created_at, title, path, banner } = item;
+  const { author, updated_at, created_at, title, path, banner } = item;
   const pictureSource = {
     webp: '../../../../../../../images/default-article.webp',
     fallback: '../../../../../../../images/default-article.jpg',
@@ -61,7 +61,7 @@ const ArticleCard = ({ item, width, height, authorImage = false }) => {
           <Author
             prefix="by"
             name={AuthorName}
-            date={created_at}
+            date={updated_at || created_at}
             isCardsAuthor
             authorImg={authorImage ? item?.author?.image : false}
           />
@@ -80,6 +80,7 @@ ArticleCard.propTypes = {
       image: PropTypes.string,
     }),
     title: PropTypes.string,
+    updated_at: PropTypes.string,
     created_at: PropTypes.string,
     path: PropTypes.string,
     banner: PropTypes.string,

package/src/components/molecules/horse-calculator/horse-calculator.module.scss

@@ -227,3 +227,7 @@
 .outcomeColumn {
   min-width: 20rem;
 }
+
+.oddsColumn {
+  min-width: 9rem;
+}

package/src/components/molecules/horse-calculator/index.js

@@ -341,7 +341,7 @@ const HorseCalculator = () => {
               <tr>
                 <th>#</th>
                 <th className={styles.outcomeColumn}>Outcome</th>
-                <th>Odds</th>
+                <th className={styles.oddsColumn}>Odds</th>
                 {eachWay === 'Yes' && <th>Place Odds</th>}
                 {ruleFour === 'Yes' && <th>Rule 4</th>}
               </tr>

package/src/gatsby-core-theme/components/atoms/module-title/module-title.module.scss

@@ -1,9 +1,10 @@
   .moduleTitle {
     @include flex-align(center, space-between);
+    margin-bottom: 1rem !important;
   
     .noTag {
       display: block;
-      margin-bottom: 1rem;
+      margin-bottom: 1.2rem !important;
     }
   
     .viewMore {

package/src/gatsby-core-theme/components/molecules/content/content.module.scss

@@ -1,7 +1,6 @@
 .content {
   width: auto !important;
   max-width: calc(var(--main-container-max) - 48px) !important;
-  margin-top: 1rem !important;
   margin-bottom: 1rem !important;
 
   img {
@@ -129,10 +128,6 @@
     #{$heading},
     .#{$heading} {
       margin-bottom: 1rem;
-
-      &:not(:first-child) {
-        margin-top: 2rem;
-      }
     }
   }
 

package/src/gatsby-core-theme/components/molecules/content/index.js

@@ -83,7 +83,7 @@ const Content = ({ module, isHomepageFirstModule = false }) => {
     <>
       <div
         className={`${styles.content} ${showMore && styles.showMore} ${switchStyle(module.style)} ${
-          isHomepageFirstModule && styles.homepageFirstModule
+          isHomepageFirstModule && styles.homepageFirstModuleContent
         }`}
       >
         {module.value &&

package/src/gatsby-core-theme/components/molecules/header/header.module.scss

@@ -3,6 +3,7 @@
   position: relative;
   z-index: 0;
   margin-top: var(--nav-height);
+  margin-bottom: 2rem;
 
   .headerImage {
     position: absolute;

package/src/gatsby-core-theme/components/molecules/module/index.js

@@ -127,7 +127,9 @@ const Modules = ({ module, page, pageContext, index, exclOperator }) => {
         style={module.background_color && moduleBackgroundColor}
         className={`${styles[moduleClassName] !== undefined ? styles[moduleClassName] : ''} ${
           module.name
-        } ${styles.module} ${module?.style && styles[module.style]} module`}
+        } ${styles.module} ${module?.style && styles[module.style]} module ${
+          homepageFirstModule && styles.isHomepageFirstModule
+        }`}
       >
         {module.name !== 'top_list' && (
           <ModuleTitle module={module} isHomepageFirstModule={homepageFirstModule} />

package/src/gatsby-core-theme/components/molecules/module/module.module.scss

@@ -1,5 +1,6 @@
 .module {
   background-color: var(--module-background-color);
+  padding-bottom: var(--module-bottom-spacing);
 }
 
 .contentModule {

package/src/gatsby-core-theme/components/organisms/toplist/index.js

@@ -32,6 +32,8 @@ const TopList = ({
     </div>
   ));
 
+  const moduleStyle = module?.style;
+
   const Tabs = showTabs && loadable(() => import('~hooks/tabs'));
   const Title =
     !showTabs &&
@@ -45,6 +47,7 @@ const TopList = ({
       module={module}
       tabsAlign="right"
       gtmClass="toplist-tabs-menu-gtm"
+      moduleStyle={moduleStyle}
       isHomepageFirstModule={isHomepageFirstModule}
     >
       {content}
@@ -53,10 +56,19 @@ const TopList = ({
     <>
       {Title && (
         <div className={`${styles.tabsHeader} ${styles.titleAndTab}`}>
-          <Title isHomepageFirstModule={isHomepageFirstModule} module={module} />
+          <Title
+            module={module}
+            moduleStyle={moduleStyle}
+            isHomepageFirstModule={isHomepageFirstModule}
+          />
         </div>
       )}
-      {ModuleIntro && <ModuleIntro module={{ value: module.module_introduction }} />}
+      {ModuleIntro && (
+        <ModuleIntro
+          module={{ value: module.module_introduction }}
+          isHomepageFirstModule={isHomepageFirstModule}
+        />
+      )}
       {content}
     </>
   );

package/src/gatsby-core-theme/hooks/tabs/index.js

@@ -16,6 +16,7 @@ const Tabs = ({
   HeaderComp,
   headerClass = '',
   gtmClass = '',
+  moduleStyle,
   isHomepageFirstModule = false,
 }) => {
   const showAllTabId = `${showAll}_0`;
@@ -36,8 +37,18 @@ const Tabs = ({
   return (
     <>
       <div className={tabHeaderClass}>
-        <div className={styles.titleAndTab}>
-          {Title && <Title isHomepageFirstModule={isHomepageFirstModule} module={module} />}
+        <div
+          className={`${styles.titleAndTab} ${moduleStyle && styles[moduleStyle]} ${
+            isHomepageFirstModule && styles.isHomepageFirstModule
+          }`}
+        >
+          {Title && (
+            <Title
+              module={module}
+              moduleStyle={moduleStyle}
+              isHomepageFirstModule={isHomepageFirstModule}
+            />
+          )}
           {TabList && (
             <TabList
               siteName={siteName}
@@ -58,7 +69,12 @@ const Tabs = ({
         </div>
         {HeaderComp && <div className={styles.headerComp}>{HeaderComp}</div>}
       </div>
-      {ModuleIntro && <ModuleIntro module={{ value: module.module_introduction }} />}
+      {ModuleIntro && (
+        <ModuleIntro
+          module={{ value: module.module_introduction }}
+          isHomepageFirstModule={isHomepageFirstModule}
+        />
+      )}
       <div className="tab-content">
         {children.map(
           (child, index) =>
@@ -86,6 +102,7 @@ Tabs.propTypes = {
   module: PropTypes.shape({}),
   siteName: PropTypes.string,
   gtmClass: PropTypes.string,
+  moduleStyle: PropTypes.string,
   isHomepageFirstModule: PropTypes.bool,
 };
 

package/src/gatsby-core-theme/hooks/tabs/tab/tab-list.module.scss

@@ -1,7 +1,7 @@
 .tabList {
   @include flex-align(center, flex-start);
   position: relative;
-  margin: 2rem 0;
+  margin: 0 0 2rem 0;
   &.right {
     display: unset;
     @include min(tablet){

package/src/gatsby-core-theme/hooks/tabs/title/index.js

@@ -9,7 +9,7 @@ import { Context } from 'gatsby-core-theme/src/context/MainProvider';
 import styles from './title.module.scss';
 import { getDate } from '../../../../helpers/strings';
 
-const TabsTitle = ({ module, isHomepageFirstModule }) => {
+const TabsTitle = ({ module, moduleStyle, isHomepageFirstModule = false }) => {
   const TitleTag = module?.module_title_tag
     ? `${module?.module_title_tag}`
     : module?.module_title
@@ -21,7 +21,11 @@ const TabsTitle = ({ module, isHomepageFirstModule }) => {
   const titleText = module?.module_title || module?.title;
 
   return (
-    <TitleTag className={`${styles.noTag} ${isHomepageFirstModule ? styles.firstModule : ''}`}>
+    <TitleTag
+      className={`${styles.noTag} ${moduleStyle && styles[moduleStyle]} ${
+        isHomepageFirstModule ? styles.firstModule : ''
+      } `}
+    >
       {module?.module_title_tag ? <div className={styles.title}>{titleText}</div> : titleText}
       {showDate && (
         <span className={styles.toplistDate}>
@@ -35,6 +39,7 @@ const TabsTitle = ({ module, isHomepageFirstModule }) => {
 
 TabsTitle.propTypes = {
   isHomepageFirstModule: PropTypes.bool,
+  moduleStyle: PropTypes.string,
   module: PropTypes.shape({
     title: PropTypes.string,
     module_title: PropTypes.string,

package/src/gatsby-core-theme/styles/utils/variables/_main.scss

@@ -26,7 +26,7 @@
 
   --main-font: Roboto, sans-serif;
 
-  --module-spacing: 2rem;
+  --module-bottom-spacing: 2rem;
   --side-container: 30rem;
   --main-container-max: 99rem;
 

package/storybook/public/iframe.html

@@ -345,4 +345,4 @@
           
       
           
-            window['STORIES'] = [{"titlePrefix":"","directory":"./src","files":"**/**/**/*.stories.js","importPathMatcher":"^\\.[\\\\/](?:src(?:\\/(?!\\.)(?:(?:(?!(?:^|\\/)\\.).)*?)\\/|\\/|$)(?!\\.)(?=.)[^/]*?\\.stories\\.js)$"},{"titlePrefix":"","directory":"./src","files":"**/**/**/**/*.stories.js","importPathMatcher":"^\\.[\\\\/](?:src(?:\\/(?!\\.)(?:(?:(?!(?:^|\\/)\\.).)*?)\\/|\\/|$)(?!\\.)(?=.)[^/]*?\\.stories\\.js)$"},{"titlePrefix":"","directory":"./src","files":"**/**/**/**/**/*.stories.js","importPathMatcher":"^\\.[\\\\/](?:src(?:\\/(?!\\.)(?:(?:(?!(?:^|\\/)\\.).)*?)\\/|\\/|$)(?!\\.)(?=.)[^/]*?\\.stories\\.js)$"}];</script><script src="runtime~main.c0611b49.iframe.bundle.js"></script><script src="579.ab2ea34c.iframe.bundle.js"></script><script src="main.9c3c34bb.iframe.bundle.js"></script></body></html>
+            window['STORIES'] = [{"titlePrefix":"","directory":"./src","files":"**/**/**/*.stories.js","importPathMatcher":"^\\.[\\\\/](?:src(?:\\/(?!\\.)(?:(?:(?!(?:^|\\/)\\.).)*?)\\/|\\/|$)(?!\\.)(?=.)[^/]*?\\.stories\\.js)$"},{"titlePrefix":"","directory":"./src","files":"**/**/**/**/*.stories.js","importPathMatcher":"^\\.[\\\\/](?:src(?:\\/(?!\\.)(?:(?:(?!(?:^|\\/)\\.).)*?)\\/|\\/|$)(?!\\.)(?=.)[^/]*?\\.stories\\.js)$"},{"titlePrefix":"","directory":"./src","files":"**/**/**/**/**/*.stories.js","importPathMatcher":"^\\.[\\\\/](?:src(?:\\/(?!\\.)(?:(?:(?!(?:^|\\/)\\.).)*?)\\/|\\/|$)(?!\\.)(?=.)[^/]*?\\.stories\\.js)$"}];</script><script src="runtime~main.c0611b49.iframe.bundle.js"></script><script src="579.ab2ea34c.iframe.bundle.js"></script><script src="main.bb87da37.iframe.bundle.js"></script></body></html>