Merge main into branch

.gitignore

@@ -42,3 +42,6 @@ yarn-error.log*
 # Next bundle analyser
 /analyze
 
+# Partytown lib files
+/public/~partytown
+

.tina/collections/educational.tsx → .tina/collections/industry.tsx

@@ -3,16 +3,16 @@ import { Collection, Template } from "tinacms";
 import * as Schemas from "../../components/blocks";
 import { seoSchema } from "../../components/util/seo";
 
-const educationalSolutionsRowSchema: Template = {
+const industrySolutionsRowSchema: Template = {
   name: "SolutionsRow",
-  label: "Educational Solutions Row",
+  label: "Industry Solutions Row",
   fields: [
     {
       type: "image",
       label: "1st Card Image",
       name: "imgSrc1",
       // @ts-ignore
-      uploadDir: () => "/educational",
+      uploadDir: () => "/industry",
     },
     {
       type: "string",
@@ -29,7 +29,7 @@ const educationalSolutionsRowSchema: Template = {
       label: "2nd Card Image",
       name: "imgSrc2",
       // @ts-ignore
-      uploadDir: () => "/educational",
+      uploadDir: () => "/industry",
     },
     {
       type: "string",
@@ -46,7 +46,7 @@ const educationalSolutionsRowSchema: Template = {
       label: "3rd Card Image",
       name: "imgSrc3",
       // @ts-ignore
-      uploadDir: () => "/educational",
+      uploadDir: () => "/industry",
     },
     {
       type: "string",
@@ -129,32 +129,42 @@ const contactUsBlockSchema: Template = {
   ],
 };
 
-export const educationalSchema: Collection = {
-  label: "Educational - Index",
-  name: "educational",
+export const industrySchema: Collection = {
+  label: "Industry Pages",
+  name: "industry",
   format: "mdx",
-  path: "content/educational",
+  path: "content/industry",
   ui: {
     router: ({ document }) => {
-      return "/educational";
+      return `/industry/${document._sys.filename}`;
     },
   },
   fields: [
     // @ts-ignore
     seoSchema,
+    {
+      type: "string",
+      label: "Page heading",
+      name: "heading",
+      required: true,
+    },
+    {
+      type: "string",
+      label: "Page Subheading",
+      name: "subHeading",
+    },
     {
       type: "image",
       label: "Banner Image",
       name: "bannerImg",
       required: true,
       // @ts-ignore
-      uploadDir: () => "/educational",
+      uploadDir: () => "/industry",
     },
     {
       type: "image",
       label: "Whitepaper File",
       name: "whitepaperFile",
-      required: true,
       // @ts-ignore
       uploadDir: () => "/files",
     },
@@ -164,7 +174,7 @@ export const educationalSchema: Collection = {
       name: "_body",
       templates: [
         ...Schemas.pageBlocks,
-        educationalSolutionsRowSchema,
+        industrySolutionsRowSchema,
         whitepaperBlockSchema,
         bookingFormBlockSchema,
         contactUsBlockSchema,

.tina/collections/training.tsx

@@ -26,7 +26,11 @@ export const trainingSchema: Collection = {
       type: "string",
       name: "title",
       label: "Title",
-      required: true,
+    },
+    {
+      type: "boolean",
+      name: "showTestimonials",
+      label: "Show Testimonials",
     },
     {
       type: "object",

.tina/config.tsx

@@ -5,9 +5,9 @@ import {
   consultingSchema,
   consultingTagSchema,
 } from "./collections/consulting";
-import { educationalSchema } from "./collections/educational";
 import { employmentSchema } from "./collections/employment";
 import { globalSchema } from "./collections/global";
+import { industrySchema } from "./collections/industry";
 import { locationSchema } from "./collections/location";
 import { marketingSchema } from "./collections/marketing";
 import { newsletterSchema } from "./collections/newsletters";
@@ -69,10 +69,10 @@ const config = defineStaticConfig({
       productsIndexSchema,
       productsSchema,
       trainingSchema,
-      educationalSchema,
       newsletterSchema,
       presenterSchema,
       locationSchema,
+      industrySchema,
     ],
   },
 });

.tina/queries/queries.gql

@@ -136,3 +136,10 @@ query productContentQuery($relativePath: String!) {
     ...ProductsParts
   }
 }
+
+query industryContentQuery($relativePath: String!) {
+  ...LayoutQueryFragment
+  industry(relativePath: $relativePath) {
+    ...IndustryParts
+  }
+}

components/blocks/breadcrumbs.tsx

@@ -30,6 +30,7 @@ export const Breadcrumbs: FC<BreadcrumbsProps> = (props) => {
           { from: "employment", to: "Employment" },
           { from: "video-production", to: "Video Production" },
           { from: "Training-videos", to: "Training Videos" },
+          { from: "industry", to: "Industry" },
           { from: props.path, to: `${props.title}` },
         ]}
         activeItemClassName={listItemStyling}

components/blocks/contentCard.tsx

@@ -1,6 +1,7 @@
 import { Template } from "tinacms";
 import { TinaMarkdown } from "tinacms/dist/rich-text";
 import { componentRenderer } from "./mdxComponentRenderer";
+import { verticalListItemSchema } from "./verticalListItem";
 import { videoEmbedBlockSchema } from "./videoEmbed";
 
 export const ContentCard = ({ data }) => {
@@ -43,7 +44,7 @@ export const contentCardBlockSchema: Template = {
       type: "rich-text",
       label: "Content",
       name: "content",
-      templates: [videoEmbedBlockSchema],
+      templates: [videoEmbedBlockSchema, verticalListItemSchema],
     },
   ],
 };

components/blocks/customImage.tsx

@@ -7,8 +7,8 @@ export const CustomImage = ({ data }) => {
       <Image
         src={data.src}
         alt={data.altText}
-        height={data.height}
-        width={data.width}
+        height={data.height ?? 400}
+        width={data.width ?? 400}
         className="inline-block"
       />
     </LinkWrapper>