gatsby-theme-q3 4.5.17 → 4.5.21

package/src/components/useSiteMetaData.js

@@ -1,35 +1,35 @@
-import { get, merge, isObject, isNil } from 'lodash';
-import { useStaticQuery, graphql } from 'gatsby';
-import useRunTime from 'gatsby-theme-q3-mui/src/components/useRunTime';
-
-export default (defaultValues = {}) => {
-  const output = merge(
-    get(
-      useStaticQuery(graphql`
-        query {
-          site {
-            siteMetadata {
-              appDirectory
-              description
-              title
-            }
-          }
-        }
-      `),
-      'site.siteMetadata',
-      {},
-    ),
-    useRunTime(),
-  );
-
-  if (isObject(output) && isObject(defaultValues))
-    Object.entries(defaultValues).forEach(
-      ([key, value]) => {
-        if (isNil(output[key])) {
-          output[key] = value;
-        }
-      },
-    );
-
-  return output;
-};
+import { get, merge, isObject, isNil } from 'lodash';
+import { useStaticQuery, graphql } from 'gatsby';
+import useRunTime from 'gatsby-theme-q3-mui/src/components/useRunTime';
+
+export default (defaultValues = {}) => {
+  const output = merge(
+    get(
+      useStaticQuery(graphql`
+        query {
+          site {
+            siteMetadata {
+              appDirectory
+              description
+              title
+            }
+          }
+        }
+      `),
+      'site.siteMetadata',
+      {},
+    ),
+    useRunTime(),
+  );
+
+  if (isObject(output) && isObject(defaultValues))
+    Object.entries(defaultValues).forEach(
+      ([key, value]) => {
+        if (isNil(output[key])) {
+          output[key] = value;
+        }
+      },
+    );
+
+  return output;
+};

package/src/components/utils.js

@@ -1,23 +1,23 @@
-import axios from 'axios';
-import { navigate } from 'gatsby';
-import { setSession } from 'q3-ui-permissions';
-
-export const OP = '?op=success';
-
-export const authenticate = (
-  credentials,
-  redirectPath = '/',
-) =>
-  axios
-    .post('/authenticate', credentials)
-    .then(({ data }) => {
-      setSession(data);
-      window.location.replace(redirectPath);
-      return data;
-    });
-
-export const hasOp = (search) =>
-  search && search.includes(OP);
-
-export const toOp = (pathname) => () =>
-  navigate(`${pathname}${OP}`);
+import axios from 'axios';
+import { navigate } from 'gatsby';
+import { setSession } from 'q3-ui-permissions';
+
+export const OP = '?op=success';
+
+export const authenticate = (
+  credentials,
+  redirectPath = '/',
+) =>
+  axios
+    .post('/authenticate', credentials)
+    .then(({ data }) => {
+      setSession(data);
+      window.location.replace(redirectPath);
+      return data;
+    });
+
+export const hasOp = (search) =>
+  search && search.includes(OP);
+
+export const toOp = (pathname) => () =>
+  navigate(`${pathname}${OP}`);

package/src/components/withAuthenticate.jsx

@@ -1,20 +1,20 @@
-import React from 'react';
-import { useLocation } from '@reach/router';
-import useSiteMetaData from './useSiteMetaData';
-import { authenticate } from './utils';
-
-export default (Component) => (props) => {
-  const { appDirectory } = useSiteMetaData();
-
-  const redirectionPath =
-    useLocation()?.state?.gatekeeper || appDirectory;
-
-  return (
-    <Component
-      {...props}
-      authenticate={(formValues) =>
-        authenticate(formValues, redirectionPath)
-      }
-    />
-  );
-};
+import React from 'react';
+import { useLocation } from '@reach/router';
+import useSiteMetaData from './useSiteMetaData';
+import { authenticate } from './utils';
+
+export default (Component) => (props) => {
+  const { appDirectory } = useSiteMetaData();
+
+  const redirectionPath =
+    useLocation()?.state?.gatekeeper || appDirectory;
+
+  return (
+    <Component
+      {...props}
+      authenticate={(formValues) =>
+        authenticate(formValues, redirectionPath)
+      }
+    />
+  );
+};

package/src/components/withPublicTemplate.jsx

@@ -1,11 +1,11 @@
-import React from 'react';
-import PublicTemplate from './PublicTemplate';
-
-const withPublicTemplate = (Component) => (props) =>
-  (
-    <PublicTemplate {...props}>
-      <Component {...props} />
-    </PublicTemplate>
-  );
-
-export default withPublicTemplate;
+import React from 'react';
+import PublicTemplate from './PublicTemplate';
+
+const withPublicTemplate = (Component) => (props) =>
+  (
+    <PublicTemplate {...props}>
+      <Component {...props} />
+    </PublicTemplate>
+  );
+
+export default withPublicTemplate;

package/src/components/withSuccessOp.jsx

@@ -1,43 +1,43 @@
-import React from 'react';
-import { useTranslation } from 'q3-ui-locale';
-import PropTypes from 'prop-types';
-import { Link } from 'gatsby';
-import Button from '@material-ui/core/Button';
-import FormBoxNotice from './FormBoxNotice';
-import { hasOp, toOp } from './utils';
-
-const withSuccessOp = (Component, msg) => {
-  const SuccessOpMessage = (props) => {
-    const {
-      location: { search, pathname },
-    } = props;
-
-    const { t } = useTranslation();
-
-    return hasOp(search) ? (
-      <FormBoxNotice title={msg} description={msg}>
-        <Button
-          component={Link}
-          to="/login"
-          variant="contained"
-          color="secondary"
-        >
-          {t('labels:login')}
-        </Button>
-      </FormBoxNotice>
-    ) : (
-      <Component {...props} onSuccess={toOp(pathname)} />
-    );
-  };
-
-  SuccessOpMessage.propTypes = {
-    location: PropTypes.shape({
-      search: PropTypes.string,
-      pathname: PropTypes.string,
-    }).isRequired,
-  };
-
-  return SuccessOpMessage;
-};
-
-export default withSuccessOp;
+import React from 'react';
+import { useTranslation } from 'q3-ui-locale';
+import PropTypes from 'prop-types';
+import { Link } from 'gatsby';
+import Button from '@material-ui/core/Button';
+import FormBoxNotice from './FormBoxNotice';
+import { hasOp, toOp } from './utils';
+
+const withSuccessOp = (Component, msg) => {
+  const SuccessOpMessage = (props) => {
+    const {
+      location: { search, pathname },
+    } = props;
+
+    const { t } = useTranslation();
+
+    return hasOp(search) ? (
+      <FormBoxNotice title={msg} description={msg}>
+        <Button
+          component={Link}
+          to="/login"
+          variant="contained"
+          color="secondary"
+        >
+          {t('labels:login')}
+        </Button>
+      </FormBoxNotice>
+    ) : (
+      <Component {...props} onSuccess={toOp(pathname)} />
+    );
+  };
+
+  SuccessOpMessage.propTypes = {
+    location: PropTypes.shape({
+      search: PropTypes.string,
+      pathname: PropTypes.string,
+    }).isRequired,
+  };
+
+  return SuccessOpMessage;
+};
+
+export default withSuccessOp;

package/src/pages/404.jsx

@@ -1,31 +1,31 @@
-import React from 'react';
-import Graphic from 'q3-ui-assets';
-import Box from '@material-ui/core/Box';
-import Button from '@material-ui/core/Button';
-import Wrapper from 'q3-ui/lib/wrapper';
-import { Link } from 'gatsby';
-
-const NotFound = () => (
-  <Wrapper backgroundColor="transparent">
-    <Graphic
-      h1
-      title="missing"
-      icon="Missing"
-      renderBottom={() => (
-        <Box mt={1}>
-          <Button
-            component={Link}
-            to="/"
-            variant="contained"
-            color="secondary"
-            size="large"
-          >
-            Go home
-          </Button>
-        </Box>
-      )}
-    />
-  </Wrapper>
-);
-
-export default NotFound;
+import React from 'react';
+import Graphic from 'q3-ui-assets';
+import Box from '@material-ui/core/Box';
+import Button from '@material-ui/core/Button';
+import Wrapper from 'q3-ui/lib/wrapper';
+import { Link } from 'gatsby';
+
+const NotFound = () => (
+  <Wrapper backgroundColor="transparent">
+    <Graphic
+      h1
+      title="missing"
+      icon="Missing"
+      renderBottom={() => (
+        <Box mt={1}>
+          <Button
+            component={Link}
+            to="/"
+            variant="contained"
+            color="secondary"
+            size="large"
+          >
+            Go home
+          </Button>
+        </Box>
+      )}
+    />
+  </Wrapper>
+);
+
+export default NotFound;

package/src/pages/login.jsx

@@ -1,71 +1,71 @@
-import React from 'react';
-import { Link } from 'gatsby';
-import MuiLink from '@material-ui/core/Button';
-import { useTranslation } from 'q3-ui-locale';
-import Typography from '@material-ui/core/Typography';
-import Divider from '@material-ui/core/Divider';
-import Grid from '@material-ui/core/Grid';
-import Box from '@material-ui/core/Box';
-import { Form, Field } from 'q3-ui-forms/lib/builders';
-import FormBox from '../components/FormBox';
-import withAuthenticate from '../components/withAuthenticate';
-import withPublicTemplate from '../components/withPublicTemplate';
-
-const Login = withPublicTemplate(
-  withAuthenticate(({ authenticate }) => {
-    const { t } = useTranslation();
-
-    return (
-      <FormBox
-        renderBottom={
-          <>
-            <Form
-              submitLabel="login"
-              onSubmit={authenticate}
-            >
-              <Field
-                name="email"
-                type="email"
-                required
-                xl={12}
-                lg={12}
-              />
-              <Field
-                required
-                name="password"
-                type="password"
-                xl={12}
-                lg={12}
-              />
-            </Form>
-            <Box mt={2} mb={1}>
-              <Divider />
-            </Box>
-            <Grid container spacing={1}>
-              <MuiLink
-                component={Link}
-                to="/password-reset"
-              >
-                {t('labels:requestNewPassword')}
-              </MuiLink>
-              <MuiLink component={Link} to="/reverify">
-                {t('labels:reverifyLink')}
-              </MuiLink>
-            </Grid>
-          </>
-        }
-        renderTop={
-          <Typography
-            component="h1"
-            variant="h2"
-            gutterBottom
-          >
-            {t('titles:login')}
-          </Typography>
-        }
-      />
-    );
-  }),
-);
-
-export default Login;
+import React from 'react';
+import { Link } from 'gatsby';
+import MuiLink from '@material-ui/core/Button';
+import { useTranslation } from 'q3-ui-locale';
+import Typography from '@material-ui/core/Typography';
+import Divider from '@material-ui/core/Divider';
+import Grid from '@material-ui/core/Grid';
+import Box from '@material-ui/core/Box';
+import { Form, Field } from 'q3-ui-forms/lib/builders';
+import FormBox from '../components/FormBox';
+import withAuthenticate from '../components/withAuthenticate';
+import withPublicTemplate from '../components/withPublicTemplate';
+
+const Login = withPublicTemplate(
+  withAuthenticate(({ authenticate }) => {
+    const { t } = useTranslation();
+
+    return (
+      <FormBox
+        renderBottom={
+          <>
+            <Form
+              submitLabel="login"
+              onSubmit={authenticate}
+            >
+              <Field
+                name="email"
+                type="email"
+                required
+                xl={12}
+                lg={12}
+              />
+              <Field
+                required
+                name="password"
+                type="password"
+                xl={12}
+                lg={12}
+              />
+            </Form>
+            <Box mt={2} mb={1}>
+              <Divider />
+            </Box>
+            <Grid container spacing={1}>
+              <MuiLink
+                component={Link}
+                to="/password-reset"
+              >
+                {t('labels:requestNewPassword')}
+              </MuiLink>
+              <MuiLink component={Link} to="/reverify">
+                {t('labels:reverifyLink')}
+              </MuiLink>
+            </Grid>
+          </>
+        }
+        renderTop={
+          <Typography
+            component="h1"
+            variant="h2"
+            gutterBottom
+          >
+            {t('titles:login')}
+          </Typography>
+        }
+      />
+    );
+  }),
+);
+
+export default Login;

package/src/pages/password-change.jsx

@@ -1,72 +1,72 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import queryString from 'query-string';
-import { get } from 'lodash';
-import axios from 'axios';
-import { NewPasswordFields } from 'q3-ui-forms/lib/presets';
-import { Form, Field } from 'q3-ui-forms/lib/builders';
-import FormBoxContent from '../components/FormBoxContent';
-import FormBox from '../components/FormBox';
-import withSuccessOp from '../components/withSuccessOp';
-import withPublicTemplate from '../components/withPublicTemplate';
-
-const PasswordChange = ({ onSuccess, location }) => {
-  const { passwordResetToken, email } = queryString.parse(
-    get(location, 'search', ''),
-    {
-      decode: false,
-    },
-  );
-
-  return (
-    <FormBox
-      renderBottom={
-        <Form
-          onSubmit={(passwords) =>
-            axios
-              .post('/password-change', passwords)
-              .then(onSuccess)
-          }
-          initialValues={{
-            passwordResetToken,
-            email,
-          }}
-        >
-          {(values) => (
-            <>
-              {!passwordResetToken && (
-                <Field
-                  name="previousPassword"
-                  type="password"
-                  required
-                  xl={12}
-                  lg={12}
-                />
-              )}
-              <NewPasswordFields {...values} />
-            </>
-          )}
-        </Form>
-      }
-      renderTop={
-        <FormBoxContent
-          title="passwordChange"
-          description="passwordChange"
-        />
-      }
-    />
-  );
-};
-
-PasswordChange.propTypes = {
-  onSuccess: PropTypes.func.isRequired,
-  location: PropTypes.shape({
-    search: PropTypes.string,
-  }).isRequired,
-};
-
-const PasswordChangeWithTemplate = withPublicTemplate(
-  withSuccessOp(PasswordChange, 'passwordChangeNotice'),
-);
-
-export default PasswordChangeWithTemplate;
+import React from 'react';
+import PropTypes from 'prop-types';
+import queryString from 'query-string';
+import { get } from 'lodash';
+import axios from 'axios';
+import { NewPasswordFields } from 'q3-ui-forms/lib/presets';
+import { Form, Field } from 'q3-ui-forms/lib/builders';
+import FormBoxContent from '../components/FormBoxContent';
+import FormBox from '../components/FormBox';
+import withSuccessOp from '../components/withSuccessOp';
+import withPublicTemplate from '../components/withPublicTemplate';
+
+const PasswordChange = ({ onSuccess, location }) => {
+  const { passwordResetToken, email } = queryString.parse(
+    get(location, 'search', ''),
+    {
+      decode: false,
+    },
+  );
+
+  return (
+    <FormBox
+      renderBottom={
+        <Form
+          onSubmit={(passwords) =>
+            axios
+              .post('/password-change', passwords)
+              .then(onSuccess)
+          }
+          initialValues={{
+            passwordResetToken,
+            email,
+          }}
+        >
+          {(values) => (
+            <>
+              {!passwordResetToken && (
+                <Field
+                  name="previousPassword"
+                  type="password"
+                  required
+                  xl={12}
+                  lg={12}
+                />
+              )}
+              <NewPasswordFields {...values} />
+            </>
+          )}
+        </Form>
+      }
+      renderTop={
+        <FormBoxContent
+          title="passwordChange"
+          description="passwordChange"
+        />
+      }
+    />
+  );
+};
+
+PasswordChange.propTypes = {
+  onSuccess: PropTypes.func.isRequired,
+  location: PropTypes.shape({
+    search: PropTypes.string,
+  }).isRequired,
+};
+
+const PasswordChangeWithTemplate = withPublicTemplate(
+  withSuccessOp(PasswordChange, 'passwordChangeNotice'),
+);
+
+export default PasswordChangeWithTemplate;