Fix rebase errors

Author: Ruben van Leeuwen

frontend/apps/example/src/app/page.tsx

@@ -1,78 +1,23 @@
 'use client';
 
-<<<<<<< HEAD:frontend/apps/example/src/app/[locale]/page.tsx
-<<<<<<< HEAD
-<<<<<<< HEAD
-import { useParams } from 'next/navigation';
 import {
+    Locale,
     PydanticForm,
     PydanticFormFieldFormat,
     PydanticFormFieldType,
 } from 'pydantic-forms';
-=======
->>>>>>> 6b4540b (Cleanup)
-=======
-import { useParams } from 'next/navigation';
->>>>>>> 305eba5 (prettier)
 import type {
-=======
-import {
-    Locale,
->>>>>>> faa8b5a (Resolved comments):frontend/apps/example/src/app/page.tsx
     PydanticComponentMatcher,
     PydanticFormApiProvider,
     PydanticFormCustomDataProvider,
     PydanticFormLabelProvider,
 } from 'pydantic-forms';
-import {
-    PydanticForm,
-    PydanticFormFieldFormat,
-    PydanticFormFieldType,
-} from 'pydantic-forms';
-
-<<<<<<< HEAD:frontend/apps/example/src/app/[locale]/page.tsx
-<<<<<<< HEAD
-<<<<<<< HEAD
-import { TextArea } from '@/fields';
 
-import NLnl from '../../../messages/nl-NL.json';
-=======
-import {TextArea} from '@/fields';
-import {useParams} from "next/navigation";
-=======
-import {
-    handleInvalidLocale,
-    useGetTranslationMessages,
-} from '@/app/[locale]/useGetTranslationMessages';
-=======
->>>>>>> faa8b5a (Resolved comments):frontend/apps/example/src/app/page.tsx
 import { TextArea } from '@/fields';
->>>>>>> 305eba5 (prettier)
 
-<<<<<<< HEAD:frontend/apps/example/src/app/[locale]/page.tsx
->>>>>>> 6b4540b (Cleanup)
-import styles from '../page.module.css';
-=======
 import styles from './page.module.css';
->>>>>>> faa8b5a (Resolved comments):frontend/apps/example/src/app/page.tsx
 
-<<<<<<< HEAD
-export default function Home({
-    messages,
-}: {
-    messages: Record<string, string>;
-}) {
-    const params = useParams();
-    const locale = params?.locale as string; // Get locale from URL params
-=======
 export default function Home() {
-<<<<<<< HEAD:frontend/apps/example/src/app/[locale]/page.tsx
-    const { locale } = useParams();
-    const validLocale = handleInvalidLocale(locale);
->>>>>>> 6b4540b (Cleanup)
-
-=======
->>>>>>> faa8b5a (Resolved comments):frontend/apps/example/src/app/page.tsx
     const pydanticFormApiProvider: PydanticFormApiProvider = async ({
         requestBody,
     }) => {
@@ -109,17 +54,6 @@ export default function Home() {
         });
     };
 
-<<<<<<< HEAD
-=======
-    const ResetButtonAlternative = () => (
-        <button type="button">Alternative reset</button>
-    );
-
-    const CancelButtonAlternative = () => (
-        <button type="button">Alternative cancel</button>
-    );
-
->>>>>>> 305eba5 (prettier)
     const componentMatcher = (
         currentMatchers: PydanticComponentMatcher[],
     ): PydanticComponentMatcher[] => {
@@ -141,23 +75,13 @@ export default function Home() {
         ];
     };
 
-<<<<<<< HEAD:frontend/apps/example/src/app/[locale]/page.tsx
-<<<<<<< HEAD
-    // const translations = getMessages(locale);
-    // console.log('NEW translations', translations);
-
-=======
->>>>>>> 6b4540b (Cleanup)
-=======
     const customTranslations = {
         renderForm: {
             loading: 'The form is loading. Please wait.',
         },
     };
-
     const locale = Locale.enGB;
 
->>>>>>> faa8b5a (Resolved comments):frontend/apps/example/src/app/page.tsx
     return (
         <div className={styles.page}>
             <h1 style={{ marginBottom: '20px' }}>Pydantic Form </h1>
@@ -175,26 +99,8 @@ export default function Home() {
                     labelProvider: pydanticLabelProvider,
                     customDataProvider: pydanticCustomDataProvider,
                     componentMatcher: componentMatcher,
-<<<<<<< HEAD:frontend/apps/example/src/app/[locale]/page.tsx
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-                    translations: NLnl,
-=======
-                    translations : useGetTranslationMessages(validLocale)
->>>>>>> 6b4540b (Cleanup)
-=======
-                    translations : useGetTranslationMessages(validLocale), //Comment this line for default translations
-                    locale: validLocale
->>>>>>> 07848e9 (Some refactor)
-=======
-                    translations: useGetTranslationMessages(validLocale), //Comment this line for default translations
-                    locale: validLocale,
->>>>>>> 305eba5 (prettier)
-=======
                     customTranslations: customTranslations,
                     locale: locale,
->>>>>>> faa8b5a (Resolved comments):frontend/apps/example/src/app/page.tsx
                 }}
             />
         </div>

frontend/package-lock.json

@@ -312,7 +312,7 @@ export interface PydanticFormsContextConfig {
     customTranslations?: TranslationsJSON;
 
     // locale
-    locale?: string;
+    locale?: Locale;
 }
 
 export type FormRenderer = React.JSXElementConstructor<{
@@ -517,7 +517,7 @@ export type TranslationsJSON = {
 };
 
 export type PydanticFormTranslationsWithLocale = {
-    locale: string;
+    locale: Locale;
     translations: TranslationsJSON;
 };