Add information about first notification email

This commit is contained in:
Timothy Armes
2024-10-21 15:19:28 +02:00
parent b4e1b6d24c
commit 3dfbde0ef9
12 changed files with 196 additions and 103 deletions
+74 -26
View File
@@ -1,37 +1,85 @@
import { Dispatch, SetStateAction } from "react";
import {
HiCheckCircle,
HiInformationCircle,
HiXCircle,
HiXMark,
} from "react-icons/hi2";
import { twMerge } from "tailwind-merge";
import { ResponseMessage } from "@/types";
export type InfoMessageType = "success" | "error" | "info";
const InfoMessage = ({
responseMessage,
message,
type,
className,
onDismiss,
}: {
responseMessage: ResponseMessage;
message: React.ReactNode;
type: "success" | "error" | "info";
onDismiss?: () => void;
className?: string;
}) => (
<p
className={twMerge(
"italic",
responseMessage.isSuccessful ? "text-green-600" : "text-red-600",
className,
)}
data-test="info-message"
>
{responseMessage.message}
</p>
);
}) => {
const icons = {
success: HiCheckCircle,
error: HiXCircle,
info: HiInformationCircle,
};
export const clearMessage = (
setResponseMessage: Dispatch<SetStateAction<ResponseMessage>>,
) => {
setTimeout(() => {
setResponseMessage({
isSuccessful: false,
message: "",
});
}, 10000);
const colorClasses = {
success: {
text: "text-success",
bg: "bg-success/30",
button:
"bg-transparent hover:bg-success hover:text-white focus:ring-success focus:ring-offset-success/50",
},
error: {
text: "text-error",
bg: "bg-error/30",
button:
"bg-transparent hover:bg-error hover:text-white focus:ring-error focus:ring-offset-error/50",
},
info: {
text: "text-primary",
bg: "bg-primary/30",
button:
"bg-transparent hover:bg-primary-800 hover:text-white focus:ring-primary-800 focus:ring-offset-primary-50",
},
};
const Icon = icons[type];
const { text, bg, button } = colorClasses[type];
return (
<div className={twMerge("rounded-md p-4", bg, className)}>
<div className="flex">
<div className="flex-shrink-0">
<Icon aria-hidden="true" className={twMerge("h-5 w-5", text)} />
</div>
<div className="ml-3">
<p className={twMerge("text-sm font-medium", text)}>{message}</p>
</div>
{onDismiss && (
<div className="ml-auto pl-3">
<div className="-mx-1.5 -my-1.5">
<button
type="button"
className={twMerge(
"inline-flex rounded-md border-0 p-1.5 focus:outline-none focus:ring-2 focus:ring-offset-2",
text,
bg,
button,
)}
>
<HiXMark aria-hidden="true" className="h-5 w-5" />
</button>
</div>
</div>
)}
</div>
</div>
);
};
export default InfoMessage;
+17 -16
View File
@@ -9,7 +9,7 @@ import { usePathname as useRawPathname } from "next/navigation";
import { FormProvider, useForm } from "react-hook-form";
import { z } from "zod";
import { clearMessage } from "@/components/InfoMessage";
import { InfoMessageType } from "@/components/InfoMessage";
import InfoMessage from "@/components/InfoMessage";
import { TextField } from "@/components/form/TextField";
@@ -31,10 +31,10 @@ export const SignInForm = ({ callbackPath }: SignInFormProps) => {
// We use the version from next/navigation to get the raw pathname in the current locale
const path = useRawPathname();
const [responseMessage, setResponseMessage] = useState({
isSuccessful: false,
message: "",
});
const [responseMessage, setResponseMessage] = useState<{
type: InfoMessageType;
message: string;
} | null>(null);
const form = useForm<SignInFormValues>({
resolver: zodResolver(signInSchema),
@@ -44,13 +44,13 @@ export const SignInForm = ({ callbackPath }: SignInFormProps) => {
// Clear the response message when the email field changes
const subscription = form.watch((value, { name, type }) => {
if (type === "change") {
if (name === "email" && responseMessage.message === "") {
setResponseMessage({ isSuccessful: true, message: "" });
if (name === "email" && responseMessage !== null) {
setResponseMessage(null);
}
}
});
return () => subscription.unsubscribe();
}, [form, form.watch, responseMessage.message]);
}, [form, form.watch, responseMessage]);
const onSubmit = async ({ email }: SignInFormValues) => {
try {
@@ -64,7 +64,7 @@ export const SignInForm = ({ callbackPath }: SignInFormProps) => {
throw new Error(result.error);
} else if (result?.ok) {
setResponseMessage({
isSuccessful: true,
type: "success",
message: t("checkEmail"),
});
@@ -74,11 +74,9 @@ export const SignInForm = ({ callbackPath }: SignInFormProps) => {
console.log(err);
setResponseMessage({
isSuccessful: false,
type: "error",
message: t("failure"),
});
clearMessage(setResponseMessage);
}
};
@@ -87,6 +85,7 @@ export const SignInForm = ({ callbackPath }: SignInFormProps) => {
<form onSubmit={form.handleSubmit(onSubmit)} className="space-y-4">
<TextField
name="email"
type="email"
control={form.control}
label={t("emailLabel")}
placeholder={t("emailPlaceholder")}
@@ -97,10 +96,12 @@ export const SignInForm = ({ callbackPath }: SignInFormProps) => {
{t("signInButton")}
</Button>
<InfoMessage
className="text-center"
responseMessage={responseMessage}
/>
{responseMessage && (
<InfoMessage
message={responseMessage.message}
type={responseMessage.type}
/>
)}
</form>
</FormProvider>
);