From 204ae3766b2f5533448ea0dd62db77c0c73a5037 Mon Sep 17 00:00:00 2001
From: PatrikKozak <patrik@trbl.design>
Date: Thu, 14 Sep 2023 14:37:34 -0400
Subject: [PATCH] chore: gets rid of unique key prop & prop className did not
 match warnings

---
 .../src/app/_components/content/contentBlock.tsx   |  6 +++---
 .../src/app/_components/content/formBlock.tsx      |  8 ++++----
 .../src/app/_components/content/mediaBlock.tsx     | 10 +++++-----
 .../app/_components/content/mediaContentBlock.tsx  | 14 +++++++-------
 templates/developer-portfolio/src/app/layout.tsx   |  2 +-
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/templates/developer-portfolio/src/app/_components/content/contentBlock.tsx b/templates/developer-portfolio/src/app/_components/content/contentBlock.tsx
index c297751927..0f896165d8 100644
--- a/templates/developer-portfolio/src/app/_components/content/contentBlock.tsx
+++ b/templates/developer-portfolio/src/app/_components/content/contentBlock.tsx
@@ -1,4 +1,4 @@
-import { FC } from 'react'
+import { FC, Fragment } from 'react'
 
 import { Block, BlockProps } from '../ui/block'
 import { PayloadLink, PayloadLinkType } from './link'
@@ -16,7 +16,7 @@ interface ContentBlockProps {
 
 export const ContentBlock: FC<ContentBlockProps> = ({ contentFields }) => {
   return (
-    <>
+    <Fragment>
       {contentFields.map(({ richText, size, id, enableLink, link }) => {
         let content = <RichText content={richText} />
 
@@ -30,6 +30,6 @@ export const ContentBlock: FC<ContentBlockProps> = ({ contentFields }) => {
           </Block>
         )
       })}
-    </>
+    </Fragment>
   )
 }
diff --git a/templates/developer-portfolio/src/app/_components/content/formBlock.tsx b/templates/developer-portfolio/src/app/_components/content/formBlock.tsx
index 9dcc2cb5bb..5290164c7a 100644
--- a/templates/developer-portfolio/src/app/_components/content/formBlock.tsx
+++ b/templates/developer-portfolio/src/app/_components/content/formBlock.tsx
@@ -1,5 +1,5 @@
 'use client'
-import React, { FC, useState } from 'react'
+import React, { FC, Fragment, useState } from 'react'
 import { useForm } from 'react-hook-form'
 import { Data } from 'payload/dist/admin/components/forms/Form/types'
 
@@ -170,7 +170,7 @@ export const FormBlock: FC<FormBlockProps> = props => {
               }
 
               return (
-                <>
+                <Fragment key={`row-${index}`}>
                   <style
                     key={`style-${index}`}
                     dangerouslySetInnerHTML={{
@@ -189,7 +189,7 @@ export const FormBlock: FC<FormBlockProps> = props => {
                   />
                   <div
                     id={`formField__${props.id}`}
-                    key={index}
+                    key={`${formID}-${field.name}-${index}`}
                     className="inline-flex flex-col gap-2 mt-4 first:mt-0 content-box pb-4 last:pb-0 lg:pb-0 pr-0 lg:pr-5 last:pr-0 "
                   >
                     <label htmlFor={props.id} className="text-sm text-primary">
@@ -202,7 +202,7 @@ export const FormBlock: FC<FormBlockProps> = props => {
                       </div>
                     )}
                   </div>
-                </>
+                </Fragment>
               )
             })}
           </div>
diff --git a/templates/developer-portfolio/src/app/_components/content/mediaBlock.tsx b/templates/developer-portfolio/src/app/_components/content/mediaBlock.tsx
index 8733ba208b..7e46b1a828 100644
--- a/templates/developer-portfolio/src/app/_components/content/mediaBlock.tsx
+++ b/templates/developer-portfolio/src/app/_components/content/mediaBlock.tsx
@@ -1,4 +1,4 @@
-import { FC } from 'react'
+import { FC, Fragment } from 'react'
 import { cva } from 'class-variance-authority'
 import Image from 'next/image'
 
@@ -53,12 +53,12 @@ export const MediaBlock: FC<MediaBlockProps> = ({
   captionSize,
 }) => {
   return (
-    <>
+    <Fragment>
       {mediaFields.map(({ media, size, mediaFit = 'cover' }) => {
         const mediaInfo = media as Media
 
         const base = (
-          <>
+          <Fragment>
             <div
               className={cn(
                 'flex-0 flex relative',
@@ -78,7 +78,7 @@ export const MediaBlock: FC<MediaBlockProps> = ({
                 priority={priority}
               />
             </div>
-          </>
+          </Fragment>
         )
 
         const containerClassNames = cn(
@@ -114,6 +114,6 @@ export const MediaBlock: FC<MediaBlockProps> = ({
           </Block>
         )
       })}
-    </>
+    </Fragment>
   )
 }
diff --git a/templates/developer-portfolio/src/app/_components/content/mediaContentBlock.tsx b/templates/developer-portfolio/src/app/_components/content/mediaContentBlock.tsx
index 465bc964fc..d828f40704 100644
--- a/templates/developer-portfolio/src/app/_components/content/mediaContentBlock.tsx
+++ b/templates/developer-portfolio/src/app/_components/content/mediaContentBlock.tsx
@@ -1,4 +1,4 @@
-import { FC } from 'react'
+import { FC, Fragment } from 'react'
 
 import { Media } from '../../../payload-types'
 import { ContentBlock } from './contentBlock'
@@ -31,7 +31,7 @@ const complimentSizes: Record<LayoutSize, LayoutSize> = {
 
 export const MediaContentBlock: FC<MediaContentBlockProps> = ({ mediaContentFields, priority }) => {
   return (
-    <>
+    <Fragment>
       {mediaContentFields?.map(
         ({ alignment, mediaSize, media, richText, link, enableLink, mediaFit }) => {
           const mediaBlock = (
@@ -62,17 +62,17 @@ export const MediaContentBlock: FC<MediaContentBlockProps> = ({ mediaContentFiel
           let content
           if (alignment === 'contentMedia') {
             content = (
-              <>
+              <Fragment>
                 {contentBlock}
                 {mediaBlock}
-              </>
+              </Fragment>
             )
           } else {
             content = (
-              <>
+              <Fragment>
                 {mediaBlock}
                 {contentBlock}
-              </>
+              </Fragment>
             )
           }
 
@@ -90,6 +90,6 @@ export const MediaContentBlock: FC<MediaContentBlockProps> = ({ mediaContentFiel
           return content
         },
       )}
-    </>
+    </Fragment>
   )
 }
diff --git a/templates/developer-portfolio/src/app/layout.tsx b/templates/developer-portfolio/src/app/layout.tsx
index cf21b8dbe6..6e395a18d3 100644
--- a/templates/developer-portfolio/src/app/layout.tsx
+++ b/templates/developer-portfolio/src/app/layout.tsx
@@ -25,7 +25,7 @@ export default async function RootLayout({ children }: { children: React.ReactNo
   const [profile, header] = await Promise.all([fetchProfile(), fetchHeader()])
 
   return (
-    <html lang="en" className={`dark ${inter.className}`}>
+    <html lang="en" className={`${inter.className} dark`}>
       <body className="w-full overflow-x-hidden">
         <ThemeProvider attribute="class" defaultTheme="system" enableSystem>
           <Backdrop />