gatsby-core-theme 9.0.1 → 10.0.0

package/CHANGELOG.md

@@ -1,3 +1,52 @@
+# [10.0.0](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v9.0.3...v10.0.0) (2022-08-09)
+
+
+### Bug Fixes
+
+* check spotlight link ([71de178](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/71de17852705e047ba0e713dc49ba18d5451eba5))
+* merged master and fixed conflict ([ce170c1](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/ce170c10c56f79d1e21692ba3456a08e550390ff))
+* prefilled modules ([2504e38](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/2504e381da3d80fc260b79037e29c0bc1d74d49a))
+* prefilled modules ([32fcd04](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/32fcd0427c9ee1ae971a78945cb70d344f3f7058))
+* prefilled modules ([a83b03a](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/a83b03a5ee1d255f69476c75089a0f06c99c25a7))
+* sitetype config ([cce65f6](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/cce65f6af73d0aea2886cc9d2b5549f73f8e9dcb))
+* sitetype config ([1a2d949](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/1a2d94936c7166a97085298488dd112100a4ab7c))
+* spotlight issue ([3d5c3f8](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/3d5c3f84a9a90127af82bb7cb4dd098485519c2f))
+* template to page type core ([68f31e2](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/68f31e2f1bdb09511a8f3524f5dd4e7b570d7431))
+* test ([3919b2e](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/3919b2ea735fb2533d63b92f31375bfd82178664))
+
+
+### Code Refactoring
+
+* additions to sitemap markup and style changes ([131cda2](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/131cda21a19119846cad30982c7d2f7c43661579))
+* html sitemap page types order ([13a3256](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/13a325680ac4606ae15bae0b0e50093e319c59c6))
+
+
+* Merge branch 'prefilled-modules' into 'master' ([86bd578](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/86bd57812da068a19905d13ca808027debe92f2e))
+* Merge branch 'prefilled-modules' of git.ilcd.rocks:team-floyd/themes/gatsby-themes into prefilled-modules ([0c38b0c](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/0c38b0c8fa9f90a68cfa26c4fc708b10e1ed6479))
+* Merge branch 'tm-2978-html-sitemap' into 'master' ([b5e083c](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/b5e083c9f43de95d589cca90dfebe9173154a103))
+* Merge branch 'tm-2988-sitetype-config' into 'master' ([215615c](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/215615c508f16f0b4d4e0c044ef5fc1cd92c20ab))
+* Merge branch 'master' into tm-2978-html-sitemap ([65e35b6](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/65e35b6c7a1b7c1f1481206a5d12df90d7a638db))
+* Merge branch 'tm-2956-page-type' into 'master' ([a2a9b79](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/a2a9b79057d2f433b1b284c7c6e85cf4d8652620))
+* Merge branch 'master' into tm-2978-html-sitemap ([fe01a22](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/fe01a22c603a62648a572d42054c7a7b34c5811d))
+
+## [9.0.3](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v9.0.2...v9.0.3) (2022-08-04)
+
+
+### Bug Fixes
+
+* add height of anchor like props ([98dfdae](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/98dfdaef2e1e10a6fb8165c9a2cd943fe7eaacec))
+
+## [9.0.2](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v9.0.1...v9.0.2) (2022-08-02)
+
+
+### Bug Fixes
+
+* add author name and link to the toplist module ([9baa500](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/9baa500eec68512f76aacfb33554902a7dfa2a7a))
+* modules test ([967fb13](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/967fb13555326b691303685b575e265ef6a8c661))
+
+
+* Merge branch 'tm-2971-adding-expert-rating-to-toplist' into 'master' ([bffd32c](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/bffd32cac4fa8837c08052d9b5b2efa319d03099))
+
 ## [9.0.1](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v9.0.0...v9.0.1) (2022-08-01)
 
 

package/gatsby-node.esm.js

@@ -172,7 +172,7 @@ exports.createPages = async ({ actions: { createPage } }, themeOptions) => {
   translations = processed.relations.translations[languageKey];
   htmlSitemapPages = processSitemapPages(pages, processed.site_markets);
 
-  if (themeOptions.siteType === 'sport') {
+  if (['rage_seo', 'rage_ppc'].includes(response.general.type)) {
     sports = Object.keys(response.relations['sports_data'].sports).map(
       (key) => response.relations['sports_data'].sports[key]
     );
@@ -264,7 +264,7 @@ exports.createPages = async ({ actions: { createPage } }, themeOptions) => {
     });
   });
 
-  if (themeOptions.siteType === 'sport') {
+  if (['rage_seo', 'rage_ppc'].includes(response.general.type)) {
     Object.keys(
       (processed.relations &&
         processed.relations.sports_data &&

package/package.json

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

package/src/components/atoms/module-title/index.js

@@ -24,13 +24,13 @@ const ModuleTitle = ({ module, viewMoreIcon = <FaAngleRight />, pageContext = nu
   //   return null;
   // }
 
-  const template = pageContext && pageContext?.page?.template;
+  const type = pageContext && pageContext?.page?.type;
 
   return (
     <>
       {(module.module_title || module.link_label) && (
         <div
-          className={`${styles.moduleTitle} ${styles[template]} ${
+          className={`${styles.moduleTitle} ${styles[type]}  ${
             module?.style && styles[module.style]
           }`}
         >

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

@@ -28,9 +28,11 @@ const Sitemap = ({ pageContext, templateIcon = <BiSitemap />, linkIcon = <IoMdLi
     return (
       templatePagesCount !== undefined && (
         <div>
-          {templateIcon && templateIcon}
+          <div>
+            {templateIcon && templateIcon}
+            <span>{templatePagesCount}</span>
+          </div>
           <span>{templateName}</span>
-          <span>{templatePagesCount}</span>
         </div>
       )
     );
@@ -57,7 +59,7 @@ const Sitemap = ({ pageContext, templateIcon = <BiSitemap />, linkIcon = <IoMdLi
 
   return (
     <Masonry breakpointCols={3} className={styles.container} columnClassName={styles.list}>
-      {Object.keys(templates).map((template) => (
+      {Object.keys(sitemapData[market]).map((template) => (
         <ul key={template}>
           {getTemplateName(template)}
           {getTemplatePages(template)}

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

@@ -47,20 +47,26 @@
         text-transform: capitalize;
       }
 
-      span:last-child {
-        @include flex-align(center, center);
-        position: absolute;
-        top: -1.2rem;
-        background-color: var(--page-number-background, green);
-        border-radius: 1.2rem;
-        border: var(--page-number-border, 0.2rem solid white);
-        margin: 0;
-        font-size: 1rem;
-        color: var(--page-number-color, white);
-        font-weight: 700;
-        width: 2.4rem;
-        height: 2.4rem;
-        left: 3.2rem;
+      > div { 
+        position: relative;
+        display: flex;
+        align-items: center;
+
+        span {
+          @include flex-align(center, center);
+          position: absolute;
+          top: -1.2rem;
+          background-color: var(--page-number-background, green);
+          border-radius: 1.2rem;
+          border: var(--page-number-border, 0.2rem solid white);
+          margin: 0;
+          font-size: 1rem;
+          color: var(--page-number-color, white);
+          font-weight: 700;
+          width: 2.4rem;
+          height: 2.4rem;
+          left: 3.2rem;
+        }
       }
     }
 
@@ -83,7 +89,7 @@
           left: -2.7rem;
           width: 2.5rem;
           top: 1.2rem;
-          border: var(--sitemap-connector-border, dashed 1px #e3e6ef);
+          border-bottom: var(--sitemap-connector-border, dashed 1px #e3e6ef);
         }
 
         &:last-child:after {
@@ -107,6 +113,7 @@
 
         a {
           padding-left: 0.3rem;
+          font-weight: var(--sitemap-link-text-font-weight, normal);
           text-decoration: var(--sitemap-link-text-decoration, none);
         }
       }

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

@@ -57,30 +57,31 @@ const Spotlights = ({ module, themeStyles = {} }) => {
       <ul>
         {items.map((item) => (
           <li key={keygen()}>
-            {item.link.type === 'external' ? (
-              <a
-                href={item.link.value}
-                className="spotlights-gtm"
-                title={item.label}
-                target="_blank"
-                rel="noreferrer"
-                aria-label={`${item?.label || item?.link_text} Link`}
-              >
-                {content(item)}
-              </a>
-            ) : (
-              <Link
-                to={item.link.value}
-                title={item.label}
-                className="spotlights-gtm"
-                aria-label={`${item?.label || item?.link_text} Link`}
-              >
-                {content(item)}
-              </Link>
-            )}
+            {item.link &&
+              (item.link.type === 'external' ? (
+                <a
+                  href={item.link.value}
+                  className="spotlights-gtm"
+                  title={item.label}
+                  target="_blank"
+                  rel="noreferrer"
+                  aria-label={`${item?.label || item?.link_text} Link`}
+                >
+                  {content(item)}
+                </a>
+              ) : (
+                <Link
+                  to={item.link.value}
+                  title={item.label}
+                  className="spotlights-gtm"
+                  aria-label={`${item?.label || item?.link_text} Link`}
+                >
+                  {content(item)}
+                </Link>
+              ))}
 
             {mode === 'image_text' &&
-              (item.link.value ? (
+              (item.link && item.link.value ? (
                 <div className={styles.spotlightsTextCTA}>
                   <div dangerouslySetInnerHTML={{ __html: item.text }} />
                   {item.link.type === 'external' ? (

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

@@ -45,10 +45,11 @@ const Content = ({ module, pageContext = null }) => {
     return null;
   };
   const template = pageContext?.page?.template;
+  const type = pageContext?.page?.type;
 
   return (
     <>
-      <div className={`${styles.grid} ${styles[template]}`}>
+      <div className={`${styles.grid} ${styles[type]} ${styles[template]}`}>
         {module.value &&
           parse(module.value, {
             replace: replaceMedia,

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

@@ -69,11 +69,9 @@ function Header({ section, content = null, backgroundImage = true }) {
           )}
         </div>
 
-        {section.page.template !== 'author' &&
-          section.page.template !== 'article_detail' &&
-          section.page.template !== 'article_casino' &&
-          section.page.template !== 'article_sports' &&
-          section.page.template !== 'game_review' && <h1>{section.page.title}</h1>}
+        {section.page.template !== 'author' && !['article', 'game'].includes(section.page.type) && (
+          <h1>{section.page.title}</h1>
+        )}
         <div className={!content && styles.headerText}>{headerContent()}</div>
       </div>
     </header>
@@ -85,6 +83,7 @@ Header.propTypes = {
   section: PropTypes.shape({
     page: PropTypes.shape({
       template: PropTypes.string,
+      type: PropTypes.string,
       path: PropTypes.string,
       updated_at: PropTypes.string,
       created_at: PropTypes.string,

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

@@ -17,6 +17,8 @@ function Anchor({
   isFixed = true,
   icon = null,
   showTitle = true,
+  heightOfAnchor = 60,
+  offset = 10,
 }) {
   const [offsetTop, setOffsetTop] = useState(null);
   const itemsRef = useRef([]);
@@ -38,7 +40,7 @@ function Anchor({
     if (targetEl) {
       const offsetPosition = targetEl.offsetTop - headerOffset;
       window.scrollTo({
-        top: isFixed ? offsetPosition - 59 : offsetPosition,
+        top: isFixed ? offsetPosition - heightOfAnchor : offsetPosition,
       });
     }
   };
@@ -47,7 +49,7 @@ function Anchor({
     // get element in viewport
     const currentAnchor = anchorList?.map((el) => {
       const element = document.getElementById(el.id);
-      if (element?.offsetTop - headerOffset - 60 <= window.scrollY) {
+      if (element?.offsetTop - headerOffset - heightOfAnchor - offset <= window.scrollY) {
         return element;
       }
       return null;
@@ -139,6 +141,8 @@ Anchor.propTypes = {
   isFixed: PropTypes.bool,
   icon: PropTypes.element,
   showTitle: PropTypes.string,
+  heightOfAnchor: PropTypes.number,
+  offset: PropTypes.number,
 };
 
 export default Anchor;

package/src/helpers/processor/index.js

@@ -23,7 +23,7 @@ const postSectionsMap = {
   game: 'post_main_games',
 };
 
-let siteType = null;
+let rageSportType = null;
 let themeType = null;
 let pages = null;
 let pagesCloned = null;
@@ -212,15 +212,16 @@ export default {
       }
     });
 
-    siteType = themeOptions.siteType ? themeOptions.siteType : null;
-    themeType = themeOptions.themeType ? themeOptions.themeType : null;
+    rageSportType = ['rage_seo', 'rage_ppc'].includes(data.general.type);
+    themeType = data.general.type ? data.general.type : null;
+
     const searchEnabled =
       themeOptions.searchEnabled !== undefined && themeOptions.searchEnabled !== null
         ? themeOptions.searchEnabled
         : true;
 
     // add sports data
-    if (siteType === 'sport') {
+    if (rageSportType) {
       // should be able to check for site type here (type: sport)
       // assign providers to events, events to schedules etc..
       sportsData = prepareSportsData(data.relations.sports_data);
@@ -272,7 +273,7 @@ export default {
           }
 
           // add sports data
-          if (siteType === 'sport') {
+          if (rageSportType) {
             // should be able to check for site type here (type: sport)
             page.relation = addSportsDataToPage(sportsData, page, themeType);
 
@@ -344,8 +345,10 @@ export default {
                       sectionModule.value_type === ModuleValue.VALUE_TYPE_PREFILLED_MODULE_MARKET
                     ) {
                       const rawValue = prefilledMarketModulesRaw[sectionModule.value_id];
-                      rawValue.value_type = sectionModule.value_type;
-                      page.sections[sectionKey].modules[i] = rawValue;
+                      if (rawValue !== undefined) {
+                        rawValue.value_type = sectionModule.value_type;
+                        page.sections[sectionKey].modules[i] = rawValue;
+                      }
                     }
                   });
                 }

package/src/helpers/processor/modules.js

@@ -238,10 +238,19 @@ export function processArchiveModule(module, pages) {
   module.numOfPages = 1;
 }
 
-export function processTopListModule(module, relations) {
+export function processTopListModule(module, relations, pages) {
   module.items = module.items.map((listItem) => {
     listItem.items = listItem.items.map((item) => {
       const clone = pick(cloneDeep(relations.operator[item.operator_id]), topListPickKeys);
+      const operatorPage =
+        pages && pages.operator
+          ? pages.operator.filter((page) => page.relation_id === item.operator_id)
+          : [];
+
+      if (operatorPage.length >= 1) {
+        clone.authorName = operatorPage[0].author.name;
+        clone.authorPath = operatorPage[0].author.profile_page_path;
+      }
       delete clone.software;
       delete clone.bonus.deposit_methods;
       return Object.assign(clone, item);
@@ -283,7 +292,7 @@ export function processModule(
   } else if (module.name === 'archive' && previewMode) {
     processArchiveModule(module, pages);
   } else if (module.name === 'top_list') {
-    processTopListModule(module, relations);
+    processTopListModule(module, relations, pages);
   } else if (module.name === 'menu' && menus && menus[module.menu_id]) {
     module = Object.assign(module, menus[module.menu_id]);
   }

package/src/helpers/processor/sports.js

@@ -117,7 +117,7 @@ export function addSportsDataToPage(sportsData, page, themeType) {
     relation.schedule = sportsData.schedule;
   }
   // rage-seo pages data
-  if (themeType === 'rage-seo') {
+  if (themeType === 'rage_seo') {
     if (pageType === 'homepage') {
       relation.schedule = sportsData.schedule.soccer || null;
       relation.featured_events = sportsData.featured_events.soccer || null;

package/src/helpers/processor/sports.test.js

@@ -186,7 +186,7 @@ describe('Add Sports Data', () => {
   test('rage-seo homepage data', () => {
     const seoHomePages = pages.filter((page) => page.template === 'homepage');
 
-    relation = addSportsDataToPage(sportsData, seoHomePages[0], 'rage-seo');
+    relation = addSportsDataToPage(sportsData, seoHomePages[0], 'rage_seo');
     expect(Object.values(relation.schedule).length).toEqual(2);
     expect(relation.featured_events.length).toEqual(3);
     expect(Object.values(relation.tournaments).length).toEqual(2);
@@ -195,7 +195,7 @@ describe('Add Sports Data', () => {
   test('rage-seo live_stream data', () => {
     const seoLiveStreamPages = pages.filter((page) => page.template === 'live_stream');
 
-    relation = addSportsDataToPage(sportsData, seoLiveStreamPages[0], 'rage-seo');
+    relation = addSportsDataToPage(sportsData, seoLiveStreamPages[0], 'rage_seo');
     expect(Object.values(relation.schedule).length).toEqual(2);
     expect(relation.providers.length).toEqual(2);
     expect(relation.providers[0].name).toEqual('Bet365');
@@ -206,7 +206,7 @@ describe('Add Sports Data', () => {
       (page) => page.template === 'live_stream_providers'
     );
 
-    relation = addSportsDataToPage(sportsData, seoLiveStreamProviderPages[0], 'rage-seo');
+    relation = addSportsDataToPage(sportsData, seoLiveStreamProviderPages[0], 'rage_seo');
     expect(relation.providers.length).toEqual(2);
     expect(relation.providers[0].name).toEqual('Bet365');
   });
@@ -216,7 +216,7 @@ describe('Add Sports Data', () => {
       (page) => page.template === 'team' && page.relation_id && sportsData.teams[page.relation_id]
     );
 
-    relation = addSportsDataToPage(sportsData, seoTeamPages[0], 'rage-seo');
+    relation = addSportsDataToPage(sportsData, seoTeamPages[0], 'rage_seo');
     expect(relation.team.name).toEqual('FC Midtjylland');
     expect(relation.event.id).toEqual(30184);
   });
@@ -229,7 +229,7 @@ describe('Add Sports Data', () => {
         sportsData.tournaments[page.relation_id]
     );
 
-    relation = addSportsDataToPage(sportsData, seoTournamentPages[0], 'rage-seo');
+    relation = addSportsDataToPage(sportsData, seoTournamentPages[0], 'rage_seo');
     expect(relation.event.id).toEqual(30184);
     expect(relation.providers.length).toEqual(2);
     expect(relation.providers[0].name).toEqual('Bet365');
@@ -240,7 +240,7 @@ describe('Add Sports Data', () => {
       (page) => page.template === 'event' && page.relation_id && sportsData.events[page.relation_id]
     );
 
-    relation = addSportsDataToPage(sportsData, seoEventPages[0], 'rage-seo');
+    relation = addSportsDataToPage(sportsData, seoEventPages[0], 'rage_seo');
     expect(relation.event.id).toEqual(seoEventPages[0].relation_id);
     expect(relation.tournament.name).toEqual('England Championship');
     expect(relation.schedule.length).toEqual(2);
@@ -252,14 +252,14 @@ describe('Add Sports Data', () => {
         page.template === 'team' || page.template === 'tournament' || page.template === 'event'
     );
 
-    relation = addSportsDataToPage(sportsData, seoTeamTournamentEventPages[0], 'rage-seo');
+    relation = addSportsDataToPage(sportsData, seoTeamTournamentEventPages[0], 'rage_seo');
     expect(relation.mainProviders[0].name).toEqual('Bet365');
   });
 
   test('rage-seo leagues_list data', () => {
     const seoLeaguesPages = pages.filter((page) => page.template === 'leagues_list');
 
-    relation = addSportsDataToPage(sportsData, seoLeaguesPages[0], 'rage-seo');
+    relation = addSportsDataToPage(sportsData, seoLeaguesPages[0], 'rage_seo');
     expect(Object.values(relation.tournaments).length).toEqual(2);
     expect(Object.values(relation.tournaments)[1].name).toEqual('Super Cup');
   });

package/src/styles/utils/variables/_main.scss

@@ -107,6 +107,7 @@
   --icon-color: #ffffff;
   --icon-background-color: #6e6e84;
   --sitemap-link-text-decoration: none;
+  --sitemap-link-text-font-weight: normal;
 
   --storybook-soccer: var(--color-45);
   --storybook-tennis: var(--color-46);