diff --git a/src/components/ContactFormSection.tsx b/src/components/ContactFormSection.tsx
index 059cda4..d6a804c 100644
--- a/src/components/ContactFormSection.tsx
+++ b/src/components/ContactFormSection.tsx
@@ -3,6 +3,7 @@
import { FormBlock } from "@/components/blocks/Form";
import { useFormQuery } from "@/services/hooks/form";
import { useEffect } from "react";
+import Loader from "./loaders/Loader";
export default function ContactFormSection() {
const form = useFormQuery();
@@ -13,12 +14,17 @@ export default function ContactFormSection() {
return (
-
-

-
-
-
{!form.isFetching && !!form.data && }
-
+ {form.isFetching && (
+
+
+
+ )}
+
+ {!form.isFetching && (
+
+
{!form.isFetching && !!form.data && }
+
+ )}
);
}
diff --git a/src/components/blocks/Form/Email/index.tsx b/src/components/blocks/Form/Email/index.tsx
index 841ee92..31ce2d8 100644
--- a/src/components/blocks/Form/Email/index.tsx
+++ b/src/components/blocks/Form/Email/index.tsx
@@ -23,11 +23,12 @@ export const Email: React.FC<
type="email"
className="form-input"
id={name}
+ placeholder={label}
{...register(name, { pattern: /^\S[^\s@]*@\S+$/, required: requiredFromProps })}
/>
- */}
{requiredFromProps && errors[name] && }
diff --git a/src/components/blocks/Form/Number/index.tsx b/src/components/blocks/Form/Number/index.tsx
index 4a7ad38..6a64cde 100644
--- a/src/components/blocks/Form/Number/index.tsx
+++ b/src/components/blocks/Form/Number/index.tsx
@@ -19,10 +19,16 @@ export const Number: React.FC<
return (
-
-
+
+ {/*
{label}
-
+ */}
{requiredFromProps && errors[name] && }
diff --git a/src/components/blocks/Form/Text/index.tsx b/src/components/blocks/Form/Text/index.tsx
index 357af00..de14d11 100644
--- a/src/components/blocks/Form/Text/index.tsx
+++ b/src/components/blocks/Form/Text/index.tsx
@@ -19,10 +19,16 @@ export const Text: React.FC<
return (
-
-
+
+ {/*
{label}
-
+ */}
{requiredFromProps && errors[name] && }
diff --git a/src/components/blocks/Form/Textarea/index.tsx b/src/components/blocks/Form/Textarea/index.tsx
index 0a3c385..d4129a5 100644
--- a/src/components/blocks/Form/Textarea/index.tsx
+++ b/src/components/blocks/Form/Textarea/index.tsx
@@ -20,10 +20,16 @@ export const Textarea: React.FC<
return (
-
-
+
+ {/*
{label}
-
+ */}
{requiredFromProps && errors[name] && }