refactor: update company registration flow and email handling; switch to zod for validation

This commit is contained in:
Danel Kungla
2025-06-17 13:45:46 +03:00
parent fe44030190
commit 291919c2d1
18 changed files with 274 additions and 87 deletions

View File

@@ -1,18 +1,23 @@
"use client";
'use client';
import { MedReportTitle } from "@/components/med-report-title";
import React from "react";
import { yupResolver } from "@hookform/resolvers/yup";
import { useForm } from "react-hook-form";
import { companySchema } from "@/lib/validations/companySchema";
import { CompanySubmitData } from "@/lib/types/company";
import { submitCompanyRegistration } from "@/lib/services/register-company.service";
import { useRouter } from "next/navigation";
import { Label } from "@kit/ui/label";
import { Input } from "@kit/ui/input";
import { SubmitButton } from "@/components/ui/submit-button";
import { FormItem } from "@kit/ui/form";
import { Trans } from "@kit/ui/trans";
import React from 'react';
import { useRouter } from 'next/navigation';
import { MedReportTitle } from '@/components/med-report-title';
import { SubmitButton } from '@/components/ui/submit-button';
import { sendCompanyOfferEmail } from '@/lib/services/mailer.service';
import { submitCompanyRegistration } from '@/lib/services/register-company.service';
import { CompanySubmitData } from '@/lib/types/company';
import { companySchema } from '@/lib/validations/companySchema';
import { zodResolver } from '@hookform/resolvers/zod';
import { useForm } from 'react-hook-form';
import { useTranslation } from 'react-i18next';
import { FormItem } from '@kit/ui/form';
import { Input } from '@kit/ui/input';
import { Label } from '@kit/ui/label';
import { Trans } from '@kit/ui/trans';
export default function RegisterCompany() {
const router = useRouter();
@@ -21,9 +26,10 @@ export default function RegisterCompany() {
handleSubmit,
formState: { errors, isValid, isSubmitting },
} = useForm({
resolver: yupResolver(companySchema),
mode: "onChange",
resolver: zodResolver(companySchema),
mode: 'onChange',
});
const language = useTranslation().i18n.language;
async function onSubmit(data: CompanySubmitData) {
const formData = new FormData();
@@ -33,57 +39,66 @@ export default function RegisterCompany() {
try {
await submitCompanyRegistration(formData);
router.push("/register-company/success");
sendCompanyOfferEmail(data, language)
.then(() => router.push('/register-company/success'))
.catch((error) => alert('error: ' + error));
} catch (err: unknown) {
if (err instanceof Error) {
alert("Server validation error: " + err.message);
alert('Server validation error: ' + err.message);
}
alert("Server validation error");
alert('Server validation error');
}
}
return (
<div className="flex flex-row border rounded-3xl border-border max-w-5xl overflow-hidden">
<div className="flex flex-col text-center py-14 px-12 w-1/2">
<div className="border-border flex max-w-5xl flex-row overflow-hidden rounded-3xl border">
<div className="flex w-1/2 flex-col px-12 py-14 text-center">
<MedReportTitle />
<h1 className="pt-8">Ettevõtte andmed</h1>
<p className="pt-2 text-muted-foreground text-sm">
Pakkumise saamiseks palun sisesta ettevõtte andmed millega MedReport
kasutada kavatsed.
<h1 className="pt-8">
<Trans i18nKey={'account:requestCompanyAccount:title'} />
</h1>
<p className="text-muted-foreground pt-2 text-sm">
<Trans i18nKey={'account:requestCompanyAccount:description'} />
</p>
<form
onSubmit={handleSubmit(onSubmit)}
noValidate
className="flex gap-6 flex-col text-left pt-8 px-6"
className="flex flex-col gap-6 px-6 pt-8 text-left"
>
<FormItem>
<Label>Ettevõtte nimi</Label>
<Input {...register("companyName")} />
<Label>
<Trans i18nKey={'common:formField:companyName'} />
</Label>
<Input {...register('companyName')} />
</FormItem>
<FormItem>
<Label>Kontaktisik</Label>
<Input {...register("contactPerson")} />
<Label>
<Trans i18nKey={'common:formField:contactPerson'} />
</Label>
<Input {...register('contactPerson')} />
</FormItem>
<FormItem>
<Label>E-mail</Label>
<Input type="email" {...register("email")}></Input>
<Label>
<Trans i18nKey={'common:formField:email'} />
</Label>
<Input type="email" {...register('email')}></Input>
</FormItem>
<FormItem>
<Label>Telefon</Label>
<Input type="tel" {...register("phone")} />
<Label>
<Trans i18nKey={'common:formField:phone'} />
</Label>
<Input type="tel" {...register('phone')} />
</FormItem>
<SubmitButton
disabled={!isValid || isSubmitting}
pendingText="Saatmine..."
type="submit"
formAction={submitCompanyRegistration}
>
<Trans i18nKey={'account:requestCompanyAccount'} />
<Trans i18nKey={'account:requestCompanyAccount:button'} />
</SubmitButton>
</form>
</div>
<div className="w-1/2 min-w-[460px] bg-[url(/assets/med-report-logo-big.png)] bg-cover bg-center bg-no-repeat">
</div>
<div className="w-1/2 min-w-[460px] bg-[url(/assets/med-report-logo-big.png)] bg-cover bg-center bg-no-repeat"></div>
</div>
);
}

View File

@@ -1,10 +1,14 @@
import { MedReportTitle } from "@/components/med-report-title";
import Image from "next/image";
import Link from "next/link";
import Image from 'next/image';
import Link from 'next/link';
import { MedReportTitle } from '@/components/med-report-title';
import { Button } from '@/packages/ui/src/shadcn/button';
import { Trans } from '@kit/ui/trans';
export default function CompanyRegistrationSuccess() {
return (
<div className="pt-2 px-16 pb-12 border rounded-3xl border-border">
<div className="border-border rounded-3xl border px-16 pt-4 pb-12">
<MedReportTitle />
<div className="flex flex-col items-center px-4">
<Image
@@ -14,11 +18,17 @@ export default function CompanyRegistrationSuccess() {
width={326}
height={195}
/>
<h1 className="pb-2">Päring edukalt saadetud!</h1>
<p className=" text-muted-foreground text-sm">Saadame teile esimesel võimalusel vastuse</p>
<h1 className="pb-2">
<Trans i18nKey={'account:requestCompanyAccount:successTitle'} />
</h1>
<p className="text-muted-foreground text-sm">
<Trans i18nKey={'account:requestCompanyAccount:successDescription'} />
</p>
</div>
<Button className="w-full mt-8">
<Link href="/">Tagasi kodulehele</Link>
<Button className="mt-8 w-full">
<Link href="/">
<Trans i18nKey={'account:requestCompanyAccount:successButton'} />
</Link>
</Button>
</div>
);