Merge remote-tracking branch 'upstream/develop' into develop

src/templates/Castform.js

@@ -55,6 +55,7 @@ const Castform = ({ data }) => {
   return (
     <PageContext.Provider value={{ data, heading: HeadingD }}>
       <div
+        id="page"
         className="rounded"
         style={{
           fontFamily: data.metadata.font,

src/templates/Celebi.js

@@ -86,6 +86,7 @@ const Celebi = ({ data }) => {
   return (
     <PageContext.Provider value={{ data, heading: HeadingE }}>
       <div
+        id="page"
         className="relative rounded"
         style={{
           fontFamily: data.metadata.font,

src/templates/Gengar.js

@@ -59,6 +59,7 @@ const Gengar = ({ data }) => {
   return (
     <PageContext.Provider value={{ data, heading: HeadingC }}>
       <div
+        id="page"
         className="rounded"
         style={{
           fontFamily: data.metadata.font,

src/templates/Glalie.js

@@ -54,6 +54,7 @@ const Glalie = ({ data }) => {
   return (
     <PageContext.Provider value={{ data, heading: HeadingB }}>
       <div
+        id="page"
         className="rounded"
         style={{
           fontFamily: data.metadata.font,

src/templates/Onyx.js

@@ -33,6 +33,7 @@ const Onyx = ({ data }) => {
   return (
     <PageContext.Provider value={{ data, heading: HeadingA }}>
       <div
+        id="page"
         className="p-8 rounded"
         style={{
           fontFamily: data.metadata.font,

src/templates/Pikachu.js

@@ -32,6 +32,7 @@ const Pikachu = ({ data }) => {
   return (
     <PageContext.Provider value={{ data, heading: HeadingB }}>
       <div
+        id="page"
         className="p-8 rounded"
         style={{
           fontFamily: data.metadata.font,

src/templates/blocks/Contact/ContactC.js

@@ -3,8 +3,8 @@ import { useTranslation } from 'react-i18next';
 import PageContext from '../../../contexts/PageContext';
 import { safetyCheck } from '../../../utils';
 
-const ContactItem = ({ value, label, link }) => {
-  return value ? (
+const ContactItem = ({ value, label, link }) =>
+  value ? (
     <div className="flex flex-col">
       <h6 className="capitalize font-semibold">{label}</h6>
       {link ? (
@@ -16,7 +16,6 @@ const ContactItem = ({ value, label, link }) => {
       )}
     </div>
   ) : null;
-};
 
 const ContactC = () => {
   const { t } = useTranslation();

src/templates/blocks/Contact/ContactD.js

@@ -4,8 +4,8 @@ import { MdFlare } from 'react-icons/md';
 import PageContext from '../../../contexts/PageContext';
 import { safetyCheck } from '../../../utils';
 
-const ContactItem = ({ value, label, link }) => {
-  return value ? (
+const ContactItem = ({ value, label, link }) =>
+  value ? (
     <div className="flex flex-col">
       <h6 className="capitalize font-semibold">{label}</h6>
       {link ? (
@@ -17,7 +17,6 @@ const ContactItem = ({ value, label, link }) => {
       )}
     </div>
   ) : null;
-};
 
 const ContactD = () => {
   const { t } = useTranslation();

src/templates/blocks/Heading/HeadingC.js

@@ -1,11 +1,7 @@
 import React, { memo } from 'react';
 
-const HeadingC = ({ children }) => {
-  return (
-    <h6 className="font-bold text-xs uppercase tracking-wide mb-1">
-      {children}
-    </h6>
-  );
-};
+const HeadingC = ({ children }) => (
+  <h6 className="font-bold text-xs uppercase tracking-wide mb-1">{children}</h6>
+);
 
 export default memo(HeadingC);

src/templates/blocks/Heading/HeadingE.js

@@ -1,11 +1,9 @@
 import React, { memo } from 'react';
 
-const HeadingC = ({ children }) => {
-  return (
-    <h6 className="my-2 text-md uppercase font-semibold tracking-wider pb-1 border-b-2 border-gray-800">
-      {children}
-    </h6>
-  );
-};
+const HeadingC = ({ children }) => (
+  <h6 className="my-2 text-md uppercase font-semibold tracking-wider pb-1 border-b-2 border-gray-800">
+    {children}
+  </h6>
+);
 
 export default memo(HeadingC);