gatsby-core-theme 1.6.10 → 1.6.11

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## [1.6.11](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v1.6.10...v1.6.11) (2021-11-25)
+
+
+### Bug Fixes
+
+* 404 ([2355a82](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/2355a8216c6431f34bac5f6cc8dd5302446fb0f4))
+* helmet ([6299dc5](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/6299dc536bcf7d3fac7ab89326fd0c6b42a692c9))
+* helmet ([2a05f83](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/2a05f83042de1490a64f5606052104d59dfb6768))
+* preview ([5153a58](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/5153a581700032ddad095e6a6e9593df8ac8dc8b))
+* preview func ([16bb0dc](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/16bb0dca646eb50da48ad98a09fe9d5022757177))
+* tracker pages ([07c6e3c](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/07c6e3c7d86190d82989ff270364a7ba940950c2))
+* tracker pages ([6defb88](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/6defb88aeac9d9f71051e8c9f739dc4b8d41f80d))
+* tracker pages ([a61f2a8](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/a61f2a8db973fd5ba8098171e554883ac502e0a5))
+* tracker pages ([e68afc4](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/e68afc4321955393f58da1dc7cb079dfc9383db1))
+
+
+* Merge branch 'master' of git.ilcd.rocks:team-floyd/themes/gatsby-themes ([7ffdc47](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/7ffdc47fcc468429cd2ac02e482d53aa558e7c97))
+
 ## [1.6.10](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v1.6.9...v1.6.10) (2021-11-25)
 
 

package/gatsby-node.esm.js

@@ -243,19 +243,26 @@ exports.createPages = async ({ actions: { createPage } }, themeOptions) => {
         } else {
           createPage({
             path: page.path.charAt(0) === '/' ? page.path : `/${page.path}`,
-            component: require.resolve(
-              page.path === 'preview'
-                ? './src/components/app-preview.js'
-                : './src/components/app.js'
-            ),
+            component: require.resolve('./src/components/app.js'),
             context: {
               ...contextData,
               siteSchema,
               translations,
+              isPreview: page.path === 'preview',
             },
           });
         }
 
+        const trackerPageObject = {
+          meta_title: 'Tracker',
+          template: 'tracker',
+          title: 'Tracker',
+          type: 'page',
+          language: languageKey,
+          path: '',
+          meta_robots: ['noindex', 'nofollow'],
+        };
+
         // Operator tracker pages
         if (page.type === 'operator') {
           const operator = operators[page.relation_id];
@@ -265,10 +272,11 @@ exports.createPages = async ({ actions: { createPage } }, themeOptions) => {
           );
           tracker.forEach((trackerPath) => {
             // Create splash page
+            trackerPageObject['path'] = trackerPath;
             createPage({
               path: trackerPath,
-              component: require.resolve('./src/components/pages/tracker/'),
-              context: { operator },
+              component: require.resolve('./src/components/app.js'),
+              context: { page: trackerPageObject, operator, isTracker: true },
             });
           });
         }
@@ -288,7 +296,7 @@ exports.createPages = async ({ actions: { createPage } }, themeOptions) => {
             providerData.forEach((provider) => {
               createPage({
                 path: provider.tracker,
-                component: require.resolve('./src/components/pages/tracker/'),
+                component: require.resolve('./src/components/app.js'),
                 context: {
                   provider: provider.providerObject,
                 },
@@ -307,7 +315,7 @@ exports.onCreatePage = ({ page, actions }) => {
   if (page.path.includes('404')) {
     createPage({
       path: page.path,
-      component: require.resolve('./src/pages/404/'),
+      component: require.resolve('./src/components/app.js'),
       context: context404,
     });
   } else {

package/package.json

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

package/src/components/app-preview.js

@@ -1,15 +1,28 @@
+/* eslint-disable no-unused-vars */
 import React, { useEffect, useState } from 'react';
 import PropTypes from 'prop-types';
 import { globalHistory } from '@reach/router';
 
-import Body from '~pages/body';
-import Head from '~organisms/head';
-import { getPreview } from '~helpers/api';
+// import Body from '~pages/body';
+// import Head from '~organisms/head';
+// import { getPreview } from '~helpers/api';
 
 const AppPreview = ({ pageContext }) => {
   const [previewContext, setPreviewContext] = useState({});
   const [isLoading, setIsLoading] = useState({});
 
+  async function getData(searchParams, staticPath = null) {
+    const { getPreview } = await import('~helpers/api');
+    getPreview(
+      pageContext.siteName,
+      !staticPath ? searchParams.get('path') || '/' : staticPath,
+      pageContext
+    ).then((previewResponse) => {
+      setPreviewContext(previewResponse);
+      setIsLoading(false);
+    });
+  }
+
   useEffect(() => {
     setIsLoading(true);
     const searchParams =
@@ -17,23 +30,28 @@ const AppPreview = ({ pageContext }) => {
     if (!searchParams.get('path')) {
       window.location = `${window.location.origin}/preview?path=/`;
     }
-    getPreview(pageContext.siteName, searchParams.get('path') || '/', pageContext).then(
-      (previewResponse) => {
-        setPreviewContext(previewResponse);
-        setIsLoading(false);
-      }
-    );
+
+    getData(searchParams);
+    // let { hi, bye } = await import('./say.js');
+    // getPreview(pageContext.siteName, searchParams.get('path') || '/', pageContext).then(
+    //   (previewResponse) => {
+    //     setPreviewContext(previewResponse);
+    //     setIsLoading(false);
+    //   }
+    // );
 
     globalHistory.listen(({ location }) => {
       setIsLoading(true);
-      getPreview(pageContext.siteName, location.search.replace('?path=', ''), pageContext)
-        .then((previewResponse) => {
-          setPreviewContext(previewResponse);
-          setIsLoading(false);
-        })
-        .catch(() => {
-          alert('failed to load..');
-        });
+
+      getData(null, location.search.replace('?path=', ''));
+      // getPreview(pageContext.siteName, location.search.replace('?path=', ''), pageContext)
+      //   .then((previewResponse) => {
+      //     setPreviewContext(previewResponse);
+      //     setIsLoading(false);
+      //   })
+      //   .catch(() => {
+      //     alert('failed to load..');
+      //   });
     });
     // eslint-disable-next-line
   }, [pageContext.siteName]);
@@ -44,8 +62,8 @@ const AppPreview = ({ pageContext }) => {
 
   return (
     <>
-      <Head page={previewContext.page} siteInfo={previewContext.siteInfo} />
-      <Body pageContext={previewContext} />
+      {/* <Head page={previewContext.page} siteInfo={previewContext.siteInfo} />
+      <Body pageContext={previewContext} /> */}
     </>
   );
 };

package/src/components/app.js

@@ -1,24 +1,95 @@
 /* eslint-disable react/forbid-prop-types */
-import React from 'react';
+import React, { useEffect, useState } from 'react';
 import PropTypes from 'prop-types';
+import loadable from '@loadable/component';
+import { globalHistory } from '@reach/router';
 import TranslationsProvider from '~context/TranslationsProvider';
 import Body from '~pages/body';
 import Head from '~organisms/head';
 
 const App = ({ pageContext }) => {
-  const { translations } = pageContext;
-  return (
-    <TranslationsProvider value={{ translations }}>
+  const { translations, isTracker, isPreview } = pageContext;
+  const [previewContext, setPreviewContext] = useState({});
+  const [isLoading, setIsLoading] = useState({});
+
+  async function getData(searchParams, staticPath = null) {
+    const { getPreview } = await import('~helpers/api');
+    getPreview(
+      pageContext.siteName,
+      !staticPath ? searchParams.get('path') || '/' : staticPath,
+      pageContext
+    ).then((previewResponse) => {
+      setPreviewContext(previewResponse);
+      setIsLoading(false);
+    });
+  }
+
+  useEffect(() => {
+    if (isPreview) {
+      setIsLoading(true);
+      const searchParams =
+        typeof window !== 'undefined' ? new URLSearchParams(window.location.search) : null;
+      if (!searchParams.get('path')) {
+        window.location = `${window.location.origin}/preview?path=/`;
+      }
+      getData(searchParams);
+      // let { hi, bye } = await import('./say.js');
+      // getPreview(pageContext.siteName, searchParams.get('path') || '/', pageContext).then(
+      //   (previewResponse) => {
+      //     setPreviewContext(previewResponse);
+      //     setIsLoading(false);
+      //   }
+      // );
+
+      globalHistory.listen(({ location }) => {
+        setIsLoading(true);
+
+        getData(null, location.search.replace('?path=', ''));
+        // getPreview(pageContext.siteName, location.search.replace('?path=', ''), pageContext)
+        //   .then((previewResponse) => {
+        //     setPreviewContext(previewResponse);
+        //     setIsLoading(false);
+        //   })
+        //   .catch(() => {
+        //     alert('failed to load..');
+        //   });
+      });
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  if (isPreview) {
+    if (isLoading) {
+      return 'Loading...';
+    }
+  }
+
+  const TrackerContent = isTracker ? loadable(() => import(`~pages/tracker`)) : null;
+
+  return isTracker ? (
+    <>
       <Head page={pageContext.page} siteInfo={pageContext.siteInfo} />
-      <Body pageContext={pageContext} />
+      <TrackerContent pageContext={pageContext} path={pageContext.page.path} />
+    </>
+  ) : (
+    <TranslationsProvider value={{ translations }}>
+      <Head
+        page={isPreview ? previewContext.page : pageContext.page}
+        siteInfo={isPreview ? previewContext.siteInfo : pageContext.siteInfo}
+      />
+      <Body pageContext={isPreview ? previewContext : pageContext} />
     </TranslationsProvider>
   );
 };
 
 App.propTypes = {
   pageContext: PropTypes.shape({
+    siteName: PropTypes.string,
+    isTracker: PropTypes.bool,
+    isPreview: PropTypes.bool,
     page: PropTypes.shape({
       id: PropTypes.number,
+      path: PropTypes.string,
     }),
     translations: PropTypes.object,
     siteInfo: PropTypes.shape({

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

@@ -1,6 +1,5 @@
 import React, { useEffect } from 'react';
 import PropTypes from 'prop-types';
-import { Helmet } from 'react-helmet';
 import Button from '~atoms/button';
 import LazyImage from '~hooks/lazy-image';
 import { prettyTracker } from '~helpers/getters';
@@ -52,9 +51,9 @@ const Tracker = ({
   }
 
   function redirect() {
-    if (typeof window !== 'undefined' && !isStory) {
-      window.location.replace(tracker);
-    }
+    // if (typeof window !== 'undefined' && !isStory) {
+    //   window.location.replace(tracker);
+    // }
   }
 
   function manualRedirect(e) {
@@ -91,9 +90,6 @@ const Tracker = ({
     <>
       {showSplashScreen && !isMobile && (
         <>
-          <Helmet>
-            <meta name="robots" content="noindex,nofollow" />
-          </Helmet>
           <div className={styles.container}>
             {background}
             <div className={styles.content}>