gatsby-core-theme 1.6.9 → 1.6.10

package/CHANGELOG.md

@@ -1,3 +1,14 @@
+## [1.6.10](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v1.6.9...v1.6.10) (2021-11-25)
+
+
+### Bug Fixes
+
+* sitemap changed to a page from hercules ([a0e90e4](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/a0e90e4916fcc0a2918dde39971265cc48fe89da))
+* sitemap fixes ([7c35ba4](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/7c35ba42cf54a937800140387b84278479caad92))
+
+
+* Merge branch 'master' of git.ilcd.rocks:team-floyd/themes/gatsby-themes ([a75119b](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/a75119b9e50cf2f5143242dcedc49b54abcfb6ce))
+
 ## [1.6.9](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v1.6.8...v1.6.9) (2021-11-24)
 
 

package/gatsby-node.esm.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-unused-vars */
 /* eslint no-console: ["error", { allow: ["log"] }], no-shadow: ["error", { "allow": ["marketSections", "prefilledModules"] }] */
 /* eslint-disable dot-notation */
 
@@ -233,6 +234,12 @@ exports.createPages = async ({ actions: { createPage } }, themeOptions) => {
           });
         } else if (page.path === '404') {
           context404 = contextData;
+        } else if (page.path === 'sitemap') {
+          createPage({
+            path: `/${page.path}`,
+            component: require.resolve('./src/components/app.js'),
+            context: { ...contextData, sitemapData: { ...htmlSitemapPages }, templates },
+          });
         } else {
           createPage({
             path: page.path.charAt(0) === '/' ? page.path : `/${page.path}`,
@@ -297,31 +304,7 @@ exports.createPages = async ({ actions: { createPage } }, themeOptions) => {
 exports.onCreatePage = ({ page, actions }) => {
   const { createPage } = actions;
 
-  if (page.path.includes('sitemap')) {
-    const pageNotFoundData = {
-      meta_title: 'Sitemap',
-      template: 'sitemap',
-      title: 'Site Map',
-      type: 'page',
-      sections: {
-        main: null,
-        navigation: null,
-        sidebar: null,
-        footer: null,
-      },
-      language: languageKey,
-      translations,
-      relation: {
-        sports,
-      },
-    };
-    page = Object.assign(pageNotFoundData, page); // eslint-disable-line no-param-reassign
-    createPage({
-      path: page.path,
-      component: require.resolve('./src/pages/sitemap/'),
-      context: { page, siteInfo, marketSections, sitemapData: { ...htmlSitemapPages }, templates },
-    });
-  } else if (page.path.includes('404')) {
+  if (page.path.includes('404')) {
     createPage({
       path: page.path,
       component: require.resolve('./src/pages/404/'),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-core-theme",
-  "version": "1.6.9",
+  "version": "1.6.10",
   "description": "Gatsby Theme NPM Package",
   "main": "index.js",
   "GATSBY_RECAPTCHA_SITEKEY": "6LfoyvMUAAAAAO4nl_MQnqHb4XdHxEiu5cXgIqeB",
@@ -60,7 +60,8 @@
     "react-google-recaptcha": "^2.1.0",
     "react-helmet": "^6.0.0",
     "react-icons": "^4.2.0",
-    "react-lazyload": "^2.6.5"
+    "react-lazyload": "^2.6.5",
+    "react-masonry-css": "^1.0.16"
   },
   "devDependencies": {
     "@babel/core": "^7.13.1",

package/src/{pages → components/atoms}/sitemap/index.js

@@ -1,18 +1,27 @@
 /* eslint-disable array-callback-return */
 /* eslint-disable react/forbid-prop-types */
-import React from 'react';
+import React, { useContext } from 'react';
 import PropTypes from 'prop-types';
+import { BiSitemap } from 'react-icons/bi';
+import { IoMdLink } from 'react-icons/io';
+// eslint-disable-next-line import/no-extraneous-dependencies
+import Masonry from 'react-masonry-css';
+import { Context } from '~context/TranslationsProvider';
+import { translate } from '~helpers/getters';
 import styles from './sitemap.module.scss';
-import Body from '~pages/body';
-import Head from '~organisms/head';
 import Link from '~hooks/link';
 
-const Sitemap = ({ pageContext, templateIcon, linkIcon }) => {
+const Sitemap = ({ pageContext, templateIcon = <BiSitemap />, linkIcon = <IoMdLink /> }) => {
   const { templates, sitemapData } = pageContext;
+  const { translations } = useContext(Context) || {};
   const market = Object.keys(sitemapData)[0];
 
   const getTemplateName = (template) => {
-    const templateName = templates[template].short_name.replace('_', ' ');
+    const templateName = translate(
+      translations,
+      templates[template].short_name,
+      templates[template].short_name.replace('_', ' ')
+    );
     const templatePages = sitemapData[market][template];
     const templatePagesCount = templatePages && templatePages.length;
 
@@ -47,19 +56,14 @@ const Sitemap = ({ pageContext, templateIcon, linkIcon }) => {
   };
 
   return (
-    <>
-      <Head page={pageContext.page} siteInfo={pageContext.siteInfo} />
-      <Body pageContext={pageContext}>
-        <div className={styles.container}>
-          {Object.keys(templates).map((template) => (
-            <ul key={template} className={styles.list}>
-              {getTemplateName(template)}
-              {getTemplatePages(template)}
-            </ul>
-          ))}
-        </div>
-      </Body>
-    </>
+    <Masonry breakpointCols={3} className={styles.container} columnClassName={styles.list}>
+      {Object.keys(templates).map((template) => (
+        <ul key={template}>
+          {getTemplateName(template)}
+          {getTemplatePages(template)}
+        </ul>
+      ))}
+    </Masonry>
   );
 };
 
@@ -67,8 +71,6 @@ Sitemap.propTypes = {
   pageContext: PropTypes.shape({
     sitemapData: PropTypes.object,
     templates: PropTypes.object,
-    siteInfo: PropTypes.object,
-    page: PropTypes.object,
   }),
   templateIcon: PropTypes.element,
   linkIcon: PropTypes.element,

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

@@ -0,0 +1,111 @@
+.container {
+  display: flex;
+  max-width: var(--main-container-max);
+  margin: 0 auto;
+  padding: 0 2.4rem 2rem 2.4rem;
+
+  @include min(mobile) {
+    padding: 0 1.6rem 2rem 1.6rem;
+  }
+
+  @include max(mobile) {
+    display: block;
+  }
+}
+
+.list {
+  @include max(mobile) {
+    width: 100% !important;
+  }
+
+  > ul {
+    display: flex;
+    flex-direction: column;
+    padding: 1rem;
+
+    > div {
+      position: relative;
+      @include flex-align(center, flex-start);
+
+      svg {
+        fill: white !important;
+        background-color: var(--template-name-icon-background, red);
+        padding: 1rem;
+        width: 4.8rem;
+        height: 4.8rem;
+        border-radius: 2.8rem;
+      }
+
+      > span {
+        color: black;
+        font-weight: 700;
+        font-size: 2rem;
+        margin-left: 1.6rem;
+        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: 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;
+      }
+    }
+
+    > ul {
+      padding-top: 3rem;
+      padding-left: 2.7rem;
+      margin-left: 2.3rem;
+      border-left: dashed 1px #e3e6ef;
+
+      li {
+        display: grid;
+        grid-template-columns: 0.1fr 1fr;
+        gap: 0.5rem;
+        margin-bottom: 1rem;
+        position: relative;
+
+        &:before {
+          content: ' ';
+          position: absolute;
+          left: -2.7rem;
+          width: 2.5rem;
+          top: 1.2rem;
+          border: dashed 1px #e3e6ef;
+        }
+
+        &:last-child:after {
+          content: ' ';
+          width: 1rem;
+          height: 5rem;
+          background-color: var(--sitemap-background-color);
+          position: absolute;
+          top: 1.3rem;
+          left: -2.8rem;
+        }
+
+        svg {
+          fill: white !important;
+          background-color: #6e6e84;
+          padding: 0.3rem;
+          width: 2.4rem;
+          height: 2.4rem;
+          border-radius: 0.8rem;
+        }
+
+        a {
+          padding-left: 0.3rem;
+        }
+      }
+    }
+  }
+}

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

@@ -0,0 +1,96 @@
+/* eslint-disable import/no-extraneous-dependencies */
+import React from 'react';
+import {
+  Title,
+  Description,
+  Primary,
+  PRIMARY_STORY,
+  ArgsTable,
+} from '@storybook/addon-docs/blocks';
+
+import Sitemap from '.';
+
+export default {
+  title: 'Gatsby-Theme/Atoms/Sitemap',
+  component: Sitemap,
+  argTypes: {
+    // pageContext: {
+    //   name: 'sitemapData',
+    //   type: { name: 'object', required: true },
+    //   defaultValue: null,
+    //   description: 'Object containing all links grouped by page type.',
+    //   table: {
+    //     type: { summary: 'object' },
+    //     defaultValue: { summary: null },
+    //   },
+    // },
+  },
+  parameters: {
+    docs: {
+      description: {
+        component: 'An HTML sitemap showing all pages as links',
+      },
+      page: () => (
+        <>
+          <Title />
+          <Description />
+          <Primary />
+          <ArgsTable story={PRIMARY_STORY} />
+        </>
+      ),
+    },
+  },
+};
+
+const Template = (args) => <Sitemap {...args} />;
+
+export const Default = Template.bind({});
+Default.args = {
+  pageContext: {
+    sitemapData: {
+      ie_en: {
+        1: [
+          {
+            title: 'test one',
+            path: '/test_one',
+          },
+          {
+            title: 'test two',
+            path: '/test_two',
+          },
+          {
+            title: 'test three',
+            path: '/test_three',
+          },
+        ],
+        2: [
+          {
+            title: 'template page one',
+            path: '/template_page_one',
+          },
+          {
+            title: 'template page two',
+            path: '/template_page_two',
+          },
+        ],
+        3: [
+          {
+            title: 'template two page',
+            path: 'template_teo_page',
+          },
+        ],
+      },
+    },
+    templates: {
+      1: {
+        short_name: 'template one',
+      },
+      2: {
+        short_name: 'template two',
+      },
+      3: {
+        short_name: 'template three',
+      },
+    },
+  },
+};

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

@@ -5,14 +5,17 @@ import Module from '~molecules/module';
 import styles from './main.module.scss';
 import keygen from '~helpers/keygen';
 
-const Main = ({ section = {}, page = {}, pageContext = {} }) => {
+const Main = ({ section = {}, pageContext = {} }) => {
+  const { page } = pageContext;
   const SearchPage = page.path === 's' ? loadable(() => import(`~pages/search`)) : null;
+  const HtmlSitemap = page.path === 'sitemap' ? loadable(() => import(`~atoms/sitemap`)) : null;
   const AuthorBox = page.author ? loadable(() => import(`~atoms/author-box`)) : null;
   const NotFound = page?.path?.includes('404') ? loadable(() => import(`~atoms/not-found`)) : null;
 
   return (
     <main className={styles.modulePage}>
       {NotFound && <NotFound />}
+      {HtmlSitemap && <HtmlSitemap pageContext={pageContext} />}
       {section.modules &&
         section.modules.map((module) => (
           <Module key={keygen()} module={module} page={page} pageContext={pageContext} />

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

@@ -10,16 +10,16 @@ const section = {
   modules: [
     {
       name: 'content',
-      ...getSingleContentData()
+      ...getSingleContentData(),
     },
   ],
 };
 
-const pagePath = 's';
+const pageObject = { page: { path: 's' } };
 
 describe('Main Component', () => {
   test('render main', async () => {
-    const { container, getByText } = render(<Main section={section} pagePath={pagePath} />);
+    const { container, getByText } = render(<Main section={section} pageContext={pageObject} />);
     expect(container).toBeTruthy();
     expect(container.querySelectorAll('main.modulePage')).toHaveLength(1);
 

package/src/components/pages/body/index.js

@@ -24,7 +24,7 @@ function Body({ pageContext, children }) {
     <>
       {navigation && <Navigation template={template} section={navigation} />}
       {!is404 && <Header section={pageContext} />}
-      {main && !children && <Main section={main} page={pageContext.page} />}
+      {main && !children && <Main section={main} pageContext={pageContext} />}
       {children && <main>{children}</main>}
       {Sidebar && <Sidebar section={sidebar} />}
       <ScrollToTop />

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

@@ -77,6 +77,12 @@
   --second-table-background: var(--color-17);
   --secondary-module-background: var(--color-42);
 
+  // HTML Sitemap
+  --template-name-icon-background: #ff893f;
+  --page-number-background: #393939;
+  --page-number-color: #fff;
+  --sitemap-background-color: #fff;
+
   --storybook-soccer: var(--color-45);
   --storybook-tennis: var(--color-46);
   --storybook-handball: var(--color-47);

package/src/pages/sitemap/sitemap.module.scss

@@ -1,21 +0,0 @@
-
-.container {
-    display: flex;
-  flex-flow: row;
-}
-
-.list {
-    display: flex;
-    flex-direction: column;
-
-    padding: 1rem;
-
-    > div {
-        font-weight: 700;
-        font-size: 1.6rem;
-    }
-
-    >ul {
-        padding-top: 2rem;
-    }
-}