Merge branch 'main' into jakubkarbowski/sc-25514/for-investigation-sp…

…lit-nameguard-code-into

apps/namehashlabs.org/app/api/contact-form/route.tsx

@@ -1,7 +1,7 @@
 import {
   ContactFormDataProps,
   validateContactFormData,
-} from "@namehash/internal/src/contact-form";
+} from "@namehash/internal";
 import { host } from "@/lib/shared/origin";
 import { type NextRequest, NextResponse } from "next/server";
 

internal/internal/src/contact-form.tsx → internal/internal/src/contact-form/contact-form.tsx

@@ -5,6 +5,8 @@ import cc from "classcat";
 import { CheckIcon, XCircleIcon } from "@heroicons/react/24/solid";
 import * as Yup from "yup";
 import { Button, Input, TextArea } from "@namehash/namekit-react";
+import { contactFormSchema } from "./validation";
+import { ContactFormDataProps } from "./types";
 
 enum FormFields {
   Name = "name",
@@ -14,25 +16,6 @@ enum FormFields {
   Source = "source",
 }
 
-export interface ContactFormDataProps {
-  name: string;
-  email: string;
-  telegram: string;
-  message: string;
-  source: string;
-}
-
-const contactFormSchema = Yup.object().shape({
-  name: Yup.string().required("Name is required"),
-  email: Yup.string()
-    .email("Invalid email format")
-    .required("Email is required"),
-  telegram: Yup.string()
-    .matches(/^$|^[A-Za-z0-9_]+$/, "Invalid Telegram username")
-    .optional(),
-  message: Yup.string().required("Message is required"),
-});
-
 const validationErrorsInitialState = {
   [FormFields.Name]: "",
   [FormFields.Email]: "",
@@ -50,22 +33,10 @@ interface ContactUsFormProps {
   submissionEndpoint: string;
 }
 
-// Validation function
-export async function validateContactFormData(
-  data: ContactFormDataProps,
-): Promise<Yup.ValidationError | null> {
-  try {
-    await contactFormSchema.validate(data, { abortEarly: false });
-    return null; // No errors, return null
-  } catch (error) {
-    if (error instanceof Yup.ValidationError) {
-      return error; // Return the validation error
-    }
-    throw error; // Rethrow other types of errors
-  }
-}
-
-export const ContactUsForm = ({ title, submissionEndpoint }: ContactUsFormProps) => {
+export const ContactUsForm = ({
+  title,
+  submissionEndpoint,
+}: ContactUsFormProps): JSX.Element => {
   const [isLoading, setIsLoading] = useState(false);
   const [errorMessage, setErrorMessage] = useState("");
   const [successfulFormSubmit, setSuccessfulFormSubmit] = useState(false);

internal/internal/src/contact-form/types.ts

@@ -0,0 +1,7 @@
+export interface ContactFormDataProps {
+  name: string;
+  email: string;
+  telegram: string;
+  message: string;
+  source: string;
+}

internal/internal/src/contact-form/validation.ts

@@ -0,0 +1,28 @@
+import * as Yup from "yup";
+import { ContactFormDataProps } from "./types";
+
+// Validation function
+export async function validateContactFormData(
+  data: ContactFormDataProps,
+): Promise<Yup.ValidationError | null> {
+  try {
+    await contactFormSchema.validate(data, { abortEarly: false });
+    return null; // No errors, return null
+  } catch (error) {
+    if (error instanceof Yup.ValidationError) {
+      return error; // Return the validation error
+    }
+    throw error; // Rethrow other types of errors
+  }
+}
+
+export const contactFormSchema = Yup.object().shape({
+  name: Yup.string().required("Name is required"),
+  email: Yup.string()
+    .email("Invalid email format")
+    .required("Email is required"),
+  telegram: Yup.string()
+    .matches(/^$|^[A-Za-z0-9_]+$/, "Invalid Telegram username")
+    .optional(),
+  message: Yup.string().required("Message is required"),
+});

internal/internal/src/index.ts

@@ -1,4 +1,7 @@
 import "./styles.css";
 
 export * as Metadata from "./metadata";
-export { ContactUsForm } from "./contact-form";
+
+export { ContactUsForm } from "./contact-form/contact-form";
+export { validateContactFormData } from "./contact-form/validation";
+export { type ContactFormDataProps } from "./contact-form/types";