fix: add sending form data

src/app/api/sendform/route.ts

@@ -1,13 +1,8 @@
 import nodemailer from 'nodemailer';
+import { TBaseForm } from '@shared/api/api.types';
+import { CORE } from '@shared/config/core';
 
-type TFormData = {
+async function sendMail(data: TBaseForm) {
-  name?: string;
-  phone: string;
-  message?: string;
-  form: string;
-};
-
-async function sendMail(data: TFormData) {
   const { name, phone, message, form } = data;
 
   const formattedBody = `
@@ -25,14 +20,14 @@ async function sendMail(data: TFormData) {
   const transporter = nodemailer.createTransport({
     service: 'yandex',
     auth: {
-      user: process.env.MAIL_USER,
+      user: CORE.MAIL_USER,
-      pass: process.env.MAIL_PASS,
+      pass: CORE.MAIL_PASS,
     },
   });
 
   return await transporter.sendMail({
-    from: process.env.MAIL_FROM,
+    from: CORE.MAIL_FROM,
-    to: process.env.MAIL_TO,
+    to: CORE.MAIL_TO,
     subject: 'Заявка с сайта FireExams',
     html: formattedBody,
   });
@@ -42,14 +37,24 @@ export async function POST(request: Request) {
   try {
     const payload = await request.json();
 
-    if (payload.secure === process.env.MAIL_SECURE_KEY) {
+    if (payload.secure !== CORE.MAIL_SECURE_KEY) {
       await Promise.reject('Request failure!');
     }
 
     const sendResult = await sendMail({ ...payload });
 
+    const data = { message: 'Form accepted' };
+    const headers = new Headers({
+      'Content-Type': 'application/json',
+    });
+    const options = {
+      status: 200,
+      statusText: 'OK',
+      headers: headers,
+    };
+
     if (sendResult?.messageId) {
-      return new Response('Success!', { status: 200 });
+      return new Response(JSON.stringify(data), options);
     } else {
       await Promise.reject('Sending request failure!');
     }

src/shared/api/api.service.ts

@@ -0,0 +1,35 @@
+import { API_ROUTES } from '@shared/config/routes';
+import { TBaseForm } from '@shared/api/api.types';
+import { CORE } from '@shared/config/core';
+
+type TRequest = TBaseForm;
+
+const sendFormFn = async ({ ...props }: TRequest) => {
+  try {
+    const response = await fetch('/api' + API_ROUTES.SEND_FORM, {
+      method: 'POST',
+      credentials: 'include',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify({
+        ...props,
+        secure: CORE.MAIL_SECURE_KEY,
+      }),
+    });
+
+    if (response.ok) {
+      return response;
+    } else {
+      if (response.status === 400) throw new Error(`400 Bad request`);
+      if (response.status === 401) throw new Error(`401 Unauthorized`);
+      if (response.status === 500) throw new Error('500 Internal server error');
+
+      throw new Error(`${response.status} - Network response failure`);
+    }
+  } catch (e) {
+    console.error(e);
+  }
+};
+
+export { sendFormFn };

src/shared/api/api.types.ts

@@ -0,0 +1,6 @@
+export type TBaseForm = {
+  form: string;
+  name?: string;
+  phone: string;
+  message?: string;
+};

src/shared/config/core.ts

@@ -0,0 +1,7 @@
+export const CORE = {
+  MAIL_USER: process.env.MAIL_USER,
+  MAIL_PASS: process.env.MAIL_PASS,
+  MAIL_FROM: process.env.MAIL_FROM,
+  MAIL_TO: process.env.MAIL_TO,
+  MAIL_SECURE_KEY: process.env.NEXT_PUBLIC_MAIL_SECURE_KEY,
+} as const;

src/shared/config/routes.ts

@@ -0,0 +1,4 @@
+export const API_ROUTES = {
+  SEND_FORM: '/sendform',
+  HEARTBEAT: '/heartbeat',
+} as const;

src/shared/ui/phone-input/phone-input.tsx

@@ -0,0 +1,10 @@
+//import s from './phone-input.module.scss';
+import { Input } from '@shared/ui';
+
+export default function PhoneInput() {
+  return (
+    <>
+      <Input />
+    </>
+  );
+}

src/widgets/contacts-form/ui.tsx

@@ -9,6 +9,7 @@ import { zodResolver } from '@hookform/resolvers/zod';
 import { z } from 'zod';
 
 import bgForm from '@public/images/bg-form.jpg';
+import { sendFormFn } from '@shared/api/api.service';
 
 const FormSchema = z.object({
   name: z.string().min(3),
@@ -27,7 +28,6 @@ export default function ContactsForm() {
     control,
     reset,
     formState: { errors },
-    clearErrors,
   } = useForm<TForm>({
     mode: 'onSubmit',
     reValidateMode: 'onBlur',
@@ -36,8 +36,13 @@ export default function ContactsForm() {
   });
 
   const onSubmit = async (data: TForm) => {
+    const payload = {
+      ...data,
+      form: 'contacts-form',
+    };
+
     try {
-      console.log('Form', data);
+      await sendFormFn(payload);
       toast.success('Заявка на консультацию принята');
       reset(defaultValues);
     } catch (e) {

src/widgets/footer-form/ui.tsx

@@ -8,6 +8,7 @@ import { zodResolver } from '@hookform/resolvers/zod';
 import { z } from 'zod';
 
 import man from '@public/images/footer-man.png';
+import { sendFormFn } from '@shared/api/api.service';
 
 const FormSchema = z.object({
   name: z.string().min(3),
@@ -28,7 +29,6 @@ export default function FooterForm() {
     control,
     reset,
     formState: { errors },
-    clearErrors,
   } = useForm<TForm>({
     mode: 'onSubmit',
     reValidateMode: 'onBlur',
@@ -37,8 +37,13 @@ export default function FooterForm() {
   });
 
   const onSubmit = async (data: TForm) => {
+    const payload = {
+      ...data,
+      form: 'footer-form',
+    };
+
     try {
-      console.log('Form', data);
+      await sendFormFn(payload);
       toast.success('Заявка на консультацию принята');
       reset(defaultValues);
     } catch (e) {

src/widgets/license-form/ui.tsx

@@ -9,6 +9,7 @@ import bgForm from '@public/images/bg-form.jpg';
 import { z } from 'zod';
 import { Controller, useForm } from 'react-hook-form';
 import { zodResolver } from '@hookform/resolvers/zod';
+import { sendFormFn } from '@shared/api/api.service';
 
 const FormSchema = z.object({
   name: z.string().min(3),
@@ -27,7 +28,6 @@ export default function LicenseForm() {
     control,
     reset,
     formState: { errors },
-    clearErrors,
   } = useForm<TForm>({
     mode: 'onSubmit',
     reValidateMode: 'onBlur',
@@ -36,8 +36,13 @@ export default function LicenseForm() {
   });
 
   const onSubmit = async (data: TForm) => {
+    const payload = {
+      ...data,
+      form: 'license-form',
+    };
+
     try {
-      console.log('Form', data);
+      await sendFormFn(payload);
       toast.success('Заявка на консультацию принята');
       reset(defaultValues);
     } catch (e) {

src/widgets/offer-form/ui.tsx

@@ -6,6 +6,7 @@ import { Controller, useForm } from 'react-hook-form';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { z } from 'zod';
 import toast from 'react-hot-toast';
+import { sendFormFn } from '@shared/api/api.service';
 
 const FormSchema = z.object({
   name: z.string().min(3),
@@ -24,7 +25,6 @@ export default function OfferForm() {
     control,
     reset,
     formState: { errors },
-    clearErrors,
   } = useForm<TForm>({
     mode: 'onSubmit',
     reValidateMode: 'onBlur',
@@ -33,8 +33,13 @@ export default function OfferForm() {
   });
 
   const onSubmit = async (data: TForm) => {
+    const payload = {
+      ...data,
+      form: 'offer-form',
+    };
+
     try {
-      console.log('Form', data);
+      await sendFormFn(payload);
       toast.success('Заявка на консультацию принята');
       reset(defaultValues);
     } catch (e) {

src/widgets/offer-request/ui.tsx

@@ -10,6 +10,7 @@ import toast from 'react-hot-toast';
 
 import bgForm from '@public/images/bg-form.jpg';
 import { useState } from 'react';
+import { sendFormFn } from '@shared/api/api.service';
 
 const FormSchema = z.object({
   name: z.string().min(3),
@@ -28,7 +29,6 @@ export default function OfferRequest() {
     control,
     reset,
     formState: { errors },
-    clearErrors,
   } = useForm<TForm>({
     mode: 'onSubmit',
     reValidateMode: 'onBlur',
@@ -39,8 +39,13 @@ export default function OfferRequest() {
   const [inputPhone, setInputPhone] = useState('');
 
   const onSubmitForm = async (data: TForm) => {
+    const payload = {
+      ...data,
+      form: 'offer-request-form',
+    };
+
     try {
-      console.log('Form', data);
+      await sendFormFn(payload);
       toast.success('Заявка на консультацию принята');
       reset(defaultValues);
     } catch (e) {
@@ -51,11 +56,13 @@ export default function OfferRequest() {
   };
 
   const onSubmitPhone = async (phone: string) => {
-    const data = {
+    const payload = {
-      phone,
+      phone: phone,
+      form: 'offer-request-form',
     };
+
     try {
-      console.log('Form', data);
+      await sendFormFn(payload);
       toast.success('Заявка на консультацию принята');
       setInputPhone('');
     } catch (e) {