gatsby-theme-q3 3.1.4 → 3.2.2

package/lib/components/Wrapper.js

@@ -7,41 +7,19 @@ exports.default = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _axios = _interopRequireDefault(require("axios"));
-
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _q3UiPermissions = _interopRequireDefault(require("q3-ui-permissions"));
 
-var _LocaleBundles = _interopRequireDefault(require("./LocaleBundles"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 /* eslint-disable import/no-extraneous-dependencies */
-const setBaseUrlForRest = (baseURL = process.env.GATSBY_APP_BASE_URL || 'http://localhost:9000') => {
-  _axios.default.defaults.baseURL = baseURL;
-  return _axios.default.defaults;
-};
-
 const Wrapper = ({
-  baseURL,
-  children,
-  locale
-}) => {
-  setBaseUrlForRest(baseURL);
-  return /*#__PURE__*/_react.default.createElement(_LocaleBundles.default, {
-    locale: locale
-  }, /*#__PURE__*/_react.default.createElement(_q3UiPermissions.default, null, children));
-};
+  children
+}) => /*#__PURE__*/_react.default.createElement(_q3UiPermissions.default, null, children);
 
-Wrapper.defaultProps = {
-  baseURL: undefined
-};
 Wrapper.propTypes = {
-  baseURL: _propTypes.default.string,
-  children: _propTypes.default.node.isRequired,
-  // eslint-disable-next-line
-  locale: _propTypes.default.object.isRequired
+  children: _propTypes.default.node.isRequired
 };
 var _default = Wrapper;
 exports.default = _default;

package/lib/components/__tests__/SearchEngine.test.js

@@ -0,0 +1,41 @@
+"use strict";
+
+var _SearchEngine = require("../SearchEngine");
+
+jest.mock('q3-ui-locale', () => ({
+  browser: {
+    isBrowserReady: jest.fn()
+  }
+}));
+const host = 'https://google.ca';
+beforeEach(() => {
+  Object.defineProperty(window, 'location', {
+    value: {
+      host
+    }
+  });
+});
+describe('SearchEngine', () => {
+  it('should not render descriptions without content', () => {
+    expect((0, _SearchEngine.generateMetaDescriptionOptions)().length).toBe(0);
+  });
+  it('should render descriptions with content', () => {
+    expect((0, _SearchEngine.generateMetaDescriptionOptions)('foo').length).toBeGreaterThanOrEqual(1);
+  });
+  it('should return host', () => {
+    expect((0, _SearchEngine.getStartUrl)()).toMatch(host);
+  });
+  it('should render favicon', () => {
+    expect((0, _SearchEngine.generateIcons)({
+      favicon: host
+    })).toHaveLength(1);
+  });
+  it('should not render favicon', () => {
+    expect((0, _SearchEngine.generateIcons)({
+      favicon: undefined
+    })).toHaveLength(0);
+  });
+  it('should include template literals', () => {
+    expect((0, _SearchEngine.generateBrand)('3merge')).toMatch('%s | 3merge');
+  });
+});

package/lib/components/useSiteMetaData.js

@@ -9,19 +9,20 @@ var _lodash = require("lodash");
 
 var _gatsby = require("gatsby");
 
-var _default = () => (0, _lodash.get)((0, _gatsby.useStaticQuery)((0, _gatsby.graphql)`
-      query {
-        site {
-          siteMetadata {
-            appDirectory
-            brand
-            description
-            favicon
-            logo
-            title
+var _useRunTime = _interopRequireDefault(require("gatsby-theme-q3-mui/src/components/useRunTime"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+var _default = () => (0, _lodash.merge)((0, _lodash.get)((0, _gatsby.useStaticQuery)((0, _gatsby.graphql)`
+        query {
+          site {
+            siteMetadata {
+              appDirectory
+              description
+              title
+            }
           }
         }
-      }
-    `), 'site.siteMetadata', {});
+      `), 'site.siteMetadata', {}), (0, _useRunTime.default)());
 
 exports.default = _default;

package/lib/components/withPublicTemplate.js

@@ -0,0 +1,17 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _PublicTemplate = _interopRequireDefault(require("./PublicTemplate"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const withPublicTemplate = Component => props => /*#__PURE__*/_react.default.createElement(_PublicTemplate.default, props, /*#__PURE__*/_react.default.createElement(Component, props));
+
+var _default = withPublicTemplate;
+exports.default = _default;

package/lib/components/withSuccessOp.js

@@ -41,7 +41,7 @@ const withSuccessOp = (Component, msg) => {
       component: _gatsby.Link,
       to: "/login",
       variant: "contained",
-      color: "primary"
+      color: "secondary"
     }, t('labels:login'))) : /*#__PURE__*/_react.default.createElement(Component, _extends({}, props, {
       onSuccess: (0, _utils.toOp)(pathname)
     }));

package/lib/pages/login.js

@@ -27,9 +27,11 @@ var _FormBox = _interopRequireDefault(require("../components/FormBox"));
 
 var _withAuthenticate = _interopRequireDefault(require("../components/withAuthenticate"));
 
+var _withPublicTemplate = _interopRequireDefault(require("../components/withPublicTemplate"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var _default = (0, _withAuthenticate.default)(({
+const Login = (0, _withPublicTemplate.default)((0, _withAuthenticate.default)(({
   authenticate
 }) => {
   const {
@@ -68,6 +70,6 @@ var _default = (0, _withAuthenticate.default)(({
       gutterBottom: true
     }, t('titles:login'))
   });
-});
-
+}));
+var _default = Login;
 exports.default = _default;

package/lib/pages/password-change.js

@@ -25,6 +25,8 @@ var _FormBox = _interopRequireDefault(require("../components/FormBox"));
 
 var _withSuccessOp = _interopRequireDefault(require("../components/withSuccessOp"));
 
+var _withPublicTemplate = _interopRequireDefault(require("../components/withPublicTemplate"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const PasswordChange = ({
@@ -65,7 +67,6 @@ PasswordChange.propTypes = {
     search: _propTypes.default.string
   }).isRequired
 };
-
-var _default = (0, _withSuccessOp.default)(PasswordChange, 'passwordChangeNotice');
-
+const PasswordChangeWithTemplate = (0, _withPublicTemplate.default)((0, _withSuccessOp.default)(PasswordChange, 'passwordChangeNotice'));
+var _default = PasswordChangeWithTemplate;
 exports.default = _default;

package/lib/pages/password-reset.js

@@ -19,6 +19,8 @@ var _FormBoxContent = _interopRequireDefault(require("../components/FormBoxConte
 
 var _withSuccessOp = _interopRequireDefault(require("../components/withSuccessOp"));
 
+var _withPublicTemplate = _interopRequireDefault(require("../components/withPublicTemplate"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const PasswordReset = ({
@@ -43,7 +45,6 @@ const PasswordReset = ({
 PasswordReset.propTypes = {
   onSuccess: _propTypes.default.func.isRequired
 };
-
-var _default = (0, _withSuccessOp.default)(PasswordReset, 'passwordResetNotice');
-
+const PasswordResetWithTemplate = (0, _withPublicTemplate.default)((0, _withSuccessOp.default)(PasswordReset, 'passwordResetNotice'));
+var _default = PasswordResetWithTemplate;
 exports.default = _default;

package/lib/pages/reverify.js

@@ -27,6 +27,8 @@ var _FormBoxNotice = _interopRequireDefault(require("../components/FormBoxNotice
 
 var _utils = require("../components/utils");
 
+var _withPublicTemplate = _interopRequireDefault(require("../components/withPublicTemplate"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const Reverify = ({
@@ -45,7 +47,7 @@ const Reverify = ({
     component: _gatsby.Link,
     to: "/reverify",
     variant: "contained",
-    color: "primary"
+    color: "secondary"
   }, t('labels:tryAgain')));
   return /*#__PURE__*/_react.default.createElement(_FormBox.default, {
     renderBottom: /*#__PURE__*/_react.default.createElement(_builders.Form, {
@@ -71,5 +73,6 @@ Reverify.propTypes = {
     pathname: _propTypes.default.string
   }).isRequired
 };
-var _default = Reverify;
+const ReverifyWithTemplate = (0, _withPublicTemplate.default)(Reverify);
+var _default = ReverifyWithTemplate;
 exports.default = _default;

package/lib/pages/verify.js

@@ -25,9 +25,11 @@ var _FormBox = _interopRequireDefault(require("../components/FormBox"));
 
 var _withAuthenticate = _interopRequireDefault(require("../components/withAuthenticate"));
 
+var _withPublicTemplate = _interopRequireDefault(require("../components/withPublicTemplate"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var _default = (0, _withAuthenticate.default)(({
+const Verify = (0, _withPublicTemplate.default)((0, _withAuthenticate.default)(({
   authenticate,
   ...props
 }) => {
@@ -70,6 +72,6 @@ var _default = (0, _withAuthenticate.default)(({
       description: "verify"
     })
   });
-});
-
+}));
+var _default = Verify;
 exports.default = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-theme-q3",
-  "version": "3.1.4",
+  "version": "3.2.2",
   "main": "index.js",
   "license": "MIT",
   "peerDependencies": {
@@ -23,24 +23,24 @@
     "gatsby-image": "^3.11.0",
     "gatsby-plugin-canonical-urls": "^4.2.0",
     "gatsby-plugin-force-trailing-slashes": "^1.0.5",
-    "gatsby-plugin-manifest": "^4.2.0",
     "gatsby-plugin-material-ui": "^3.0.1",
     "gatsby-plugin-netlify": "^3.14.0",
     "gatsby-plugin-robots-txt": "^1.6.14",
     "gatsby-plugin-sharp": "^4.2.0",
     "gatsby-plugin-sitemap": "^5.2.0",
-    "gatsby-source-contentful": "^7.0.0",
-    "gatsby-theme-q3-mui": "^3.1.4",
+    "gatsby-theme-q3-mui": "^3.2.2",
     "gatsby-transformer-sharp": "^4.2.0",
     "lodash": "^4.17.20",
     "process": "^0.11.10",
     "prop-types": "^15.7.2",
-    "q3-ui-locale": "^3.1.4",
+    "q3-ui-helpers": "^3.2.0",
+    "q3-ui-locale": "^3.2.1",
     "query-string": "^7.0.1",
+    "react-helmet": "^6.1.0",
     "react-share": "^4.3.1",
     "slugify": "^1.6.3",
     "transform-loader": "^0.2.4",
     "yarn": "^1.22.17"
   },
-  "gitHead": "64a2a50184b2d61aab0d77b44d7c0dc1a3d3b876"
+  "gitHead": "c250a6bd44f4475e85b15057c649c2b6cc584836"
 }

package/src/components/PageWrapper.jsx

@@ -2,23 +2,11 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { Loader } from 'q3-admin/lib/components';
 import SearchEngine from './SearchEngine';
-import useLocale from './useLocale';
 
-// cannot conditionally call hooks otherwise
-const Locale = () => {
-  useLocale();
-  return null;
-};
-
-const PageWrapper = ({
-  children,
-  includeLoader,
-  includeLocale,
-}) => (
+const PageWrapper = ({ children, includeLoader }) => (
   <>
     <SearchEngine />
     {includeLoader && <Loader />}
-    {includeLocale && <Locale />}
     {children}
   </>
 );

package/src/components/PublicTemplate.jsx

@@ -1,17 +1,141 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Public } from 'q3-admin/lib/components';
+import {
+  Box,
+  Paper,
+  Link,
+  Grid,
+  Hidden,
+  makeStyles,
+} from '@material-ui/core';
+import { Link as ReachLink } from 'gatsby';
+import { useTranslation } from 'q3-ui-locale';
 import AdminPublicGateway from './AdminPublicGateway';
 import useSiteMetaData from './useSiteMetaData';
 
+const useStyle = makeStyles((theme) => ({
+  logo: {
+    height: 95,
+    width: 180,
+    display: 'block',
+
+    '& img': {
+      objectFit: 'contain',
+      height: '100%',
+      width: '100%',
+    },
+  },
+  container: {
+    maxWidth: '85vw',
+    width: 850,
+
+    [theme.breakpoints.down('md')]: {
+      width: '100%',
+    },
+
+    [theme.breakpoints.down('sm')]: {
+      width: 'auto',
+    },
+  },
+  photo: ({ photo }) => ({
+    backgroundColor: theme.palette.secondary.light,
+    backgroundImage: `url(${photo})`,
+    backgroundSize: 'contain',
+    backgroundPosition: 'center',
+    backgroundRepeat: 'no-repeat',
+    width: '100%',
+    height: '100%',
+  }),
+}));
+
+const Copyright = () => {
+  const { brand } = useSiteMetaData();
+
+  return brand ? (
+    <Box display="inline-block" mx={1}>
+      ©{new Date().getFullYear()} {brand}
+    </Box>
+  ) : null;
+};
+
+// eslint-disable-next-line
+const TextLink = ({ href, text }) => {
+  const { t } = useTranslation('labels');
+
+  return href ? (
+    <Box display="inline-block" mx={1}>
+      <Link href={href} target="_blank">
+        {t(text)}
+      </Link>{' '}
+    </Box>
+  ) : null;
+};
+
 const PublicTemplate = ({ children, ...rest }) => {
-  const { brand, logo } = useSiteMetaData();
+  const {
+    brand,
+    cancellation,
+    logo,
+    terms,
+    privacy,
+    photo,
+  } = useSiteMetaData();
+  const cls = useStyle({
+    photo,
+  });
 
   return (
     <AdminPublicGateway {...rest}>
-      <Public companyName={brand} logo={logo}>
-        {children}
-      </Public>
+      <Box
+        alignItems="center"
+        component="article"
+        display="flex"
+        flexDirection="column"
+        justifyContent="center"
+        width="100%"
+      >
+        <Box
+          component="header"
+          mt="2vh"
+          mb={2}
+          textAlign="center"
+        >
+          <ReachLink to="/" className={cls.logo}>
+            <img alt={brand} src={logo} />
+          </ReachLink>
+        </Box>
+        <Paper className={cls.container}>
+          <Grid container spacing={1}>
+            <Hidden smDown>
+              <Grid item xs={6}>
+                <Box className={cls.photo} />
+              </Grid>
+            </Hidden>
+            <Grid item md={6} xs={12}>
+              <Box p={2}>{children}</Box>
+            </Grid>
+          </Grid>
+        </Paper>
+        <Box
+          maxWidth="75vw"
+          component="footer"
+          mt={3}
+          textAlign="center"
+        >
+          <small>
+            <Copyright />
+            <TextLink
+              href={terms}
+              text="termsAndConditions"
+            />
+            <TextLink href={privacy} text="privacyPolicy" />
+            <TextLink
+              href={cancellation}
+              text="cancellationPolicy"
+            />
+          </small>
+        </Box>
+      </Box>
     </AdminPublicGateway>
   );
 };

package/src/components/PublicTemplateBackground.jsx

@@ -0,0 +1,140 @@
+import React from 'react';
+import { Box, Link, useTheme } from '@material-ui/core';
+
+const PublicTemplateBackground = () => {
+  const theme = useTheme();
+
+  return (
+    <Box
+      position="fixed"
+      top={0}
+      right={0}
+      left={0}
+      bottom={0}
+      overflow="hidden"
+    >
+      <Box
+        position="fixed"
+        top={0}
+        right={0}
+        left={0}
+        bottom={0}
+        style={{
+          backgroundImage:
+            'url(https://images.unsplash.com/photo-1523293836414-f04e712e1f3b?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=703&q=80)',
+          opacity: 0.1,
+        }}
+      />
+      <Box
+        position="fixed"
+        top={0}
+        right={0}
+        left={0}
+        bottom={0}
+        style={{
+          background: `linear-gradient(90deg, ${theme.palette.secondary.dark} 0%, ${theme.palette.secondary.light} 35%, ${theme.palette.secondary.main} 100%)`,
+          opacity: 0.1,
+        }}
+      />
+      <svg
+        xmlns="http://www.w3.org/2000/svg"
+        style={{
+          opacity: 0.15,
+          minHeight: '100vh',
+          minWidth: '100vw',
+        }}
+      >
+        <defs>
+          <linearGradient
+            id="a"
+            x1="0"
+            x2="0"
+            y1="1"
+            y2="0"
+          >
+            <stop
+              offset="0"
+              stopColor={theme.palette.background.muted}
+            />
+            <stop
+              offset="1"
+              stopColor={theme.palette.secondary.dark}
+            />
+          </linearGradient>
+          <linearGradient
+            id="b"
+            x1="0"
+            x2="0"
+            y1="0"
+            y2="1"
+          >
+            <stop
+              offset="0"
+              stopColor={theme.palette.secondary.light}
+            />
+            <stop
+              offset="1"
+              stopColor={theme.palette.secondary.main}
+            />
+          </linearGradient>
+        </defs>
+        <g
+          fill={theme.palette.background.muted}
+          fillOpacity="0"
+          strokeMiterlimit="10"
+        >
+          <g stroke="url(#a)" strokeWidth="2">
+            <path
+              transform="translate(0 0)"
+              d="M1409 581 1450.35 511 1490 581z"
+            />
+            <circle
+              strokeWidth="4"
+              transform="rotate(0 800 450)"
+              cx="500"
+              cy="100"
+              r="40"
+            />
+            <path
+              transform="translate(0 0)"
+              d="M400.86 735.5h-83.73c0-23.12 18.74-41.87 41.87-41.87S400.86 712.38 400.86 735.5z"
+            />
+          </g>
+          <g stroke="url(#b)" strokeWidth="4">
+            <path
+              transform="translate(0 0)"
+              d="M149.8 345.2 118.4 389.8 149.8 434.4 181.2 389.8z"
+            />
+            <rect
+              strokeWidth="8"
+              transform="rotate(0 1089 759)"
+              x="1039"
+              y="709"
+              width="100"
+              height="100"
+            />
+            <path
+              transform="rotate(0 1400 132)"
+              d="M1426.8 132.4 1405.7 168.8 1363.7 168.8 1342.7 132.4 1363.7 96 1405.7 96z"
+            />
+          </g>
+        </g>
+      </svg>
+      <Box
+        position="fixed"
+        bottom="1rem"
+        right="1rem"
+        zIndex={10}
+      >
+        <small>
+          Texture made with{' '}
+          <Link href="https://www.design.svgbackgrounds.com/">
+            SVGBackgrounds.com
+          </Link>
+        </small>
+      </Box>
+    </Box>
+  );
+};
+
+export default PublicTemplateBackground;