Skip to content

fix toasty on signup page #299

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 6, 2024
Merged

fix toasty on signup page #299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
844d5e0
fix toasty on signup page
Mugisha146 Dec 6, 2024
9ba78db
use PropTypes.any to avoid ReactNodeLike mismatch
Mugisha146 Dec 6, 2024
52d6893
fix wrong message
Mugisha146 Dec 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/form/Button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Button.propTypes = {
className: PropTypes.string,
role: PropTypes.string,
label: PropTypes.string,
children: PropTypes.node,
children: PropTypes.any,
};

Button.defaultProps = {
Expand Down
135 changes: 82 additions & 53 deletions src/components/form/RegisterForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,24 +171,31 @@ function SignupForm() {
};
return (
<>

<div className="flex items-center justify-center mx-auto bg-white dark:bg-[#374151] h-screen">

<div className="relative flex items-center justify-center mx-auto bg-white dark:bg-[#374151] h-screen">
{isAnError && (
<Toasty message={isAnError} type="error" onClose={() => setError(null)} />
<div className="absolute top-10 z-50">
<Toasty
message={isAnError}
type="error"
onClose={() => setError(null)}
/>
</div>
)}
{isSuccess ? (
<div className="bg-[#1F2A37] w-[30vw] flex h-[70vh] flex-col items-center justify-center rounded-sm sm:w-5/6 lg:w-[45vw]">
<div
className={`rounded-full flex items-center justify-center ${isAnError ? "bg-white" : "bg-green"
} p-4 mx-auto mb-4`}
className={`rounded-full flex items-center justify-center ${
isAnError ? "bg-white" : "bg-green"
} p-4 mx-auto mb-4`}
>
<AiOutlineCheck className="text-white text-4xl" />
</div>
<div className="text-[#afb1b4] text-lg mb-4 font-inter">
<p>Account created, Check your email to verify your account !</p>
</div>
<Link to="/login" ><Button label="Continue" className="w-[80px]" /></Link>
<Link to="/login">
<Button label="Continue" className="w-[80px]" />
</Link>
</div>
) : (
<form
Expand Down Expand Up @@ -245,9 +252,15 @@ function SignupForm() {
className=" absolute right-4 top-4"
>
{showPassword[0] ? (
<FontAwesomeIcon icon={faEye} className="text-black dark:text-white" />
<FontAwesomeIcon
icon={faEye}
className="text-black dark:text-white"
/>
) : (
<FontAwesomeIcon icon={faEyeSlash} className="text-black dark:text-white" />
<FontAwesomeIcon
icon={faEyeSlash}
className="text-black dark:text-white"
/>
)}
</div>
</div>
Expand All @@ -264,66 +277,78 @@ function SignupForm() {
className=" absolute right-4 top-4"
>
{showPassword[1] ? (
<FontAwesomeIcon icon={faEye} className="text-black dark:text-white" />
<FontAwesomeIcon
icon={faEye}
className="text-black dark:text-white"
/>
) : (
<FontAwesomeIcon icon={faEyeSlash} className="text-black dark:text-white" />
<FontAwesomeIcon
icon={faEyeSlash}
className="text-black dark:text-white"
/>
)}
</div>
</div>
<div className="flex items-center w-[25vw] gap-10 sm:w-5/6 lg:w-[25vw] justify-between">
<div className="w-[50%]">
<InputField
placeholder="Country"
list="countries"
className="w-full rounded-md px-2 py-3 border border-white placeholder:text-gray-400 text-black dark:text-white sm:text-[12px] outline-none autofill:bg-transparent autofill:text-white bg-gray-100 dark:bg-[#1F2A37]"
{...register("country", {
onChange: (e) => handleCountryChange(e),
})}
error={errors?.country}
<InputField
placeholder="Country"
list="countries"
className="w-full rounded-md px-2 py-3 border border-white placeholder:text-gray-400 text-black dark:text-white sm:text-[12px] outline-none autofill:bg-transparent autofill:text-white bg-gray-100 dark:bg-[#1F2A37]"
{...register("country", {
onChange: (e) => handleCountryChange(e),
})}
error={errors?.country}
/>
<datalist id="countries">
{filteredCountries.map((country) => (
<option key={country.code} value={country.name} />
))}
{filteredCountries.map((country) => (
<option key={country.code} value={country.name} />
))}
</datalist>

</div>
<div className="relative w-full">
<select
{...register("gender")}
className="w-full rounded-md px-2 py-2 border border-white
<select
{...register("gender")}
className="w-full rounded-md px-2 py-2 border border-white
placeholder:text-gray-400 text-white sm:text-[12px]
outline-none bg-[#1F2A37] appearance-none"
>
<option value="" disabled selected>Gender</option>
<option value="female">female</option>
<option value="male">male</option>
<option value="other">other</option>
</select>

{/* Dropdown arrow */}
<div className="absolute right-3 top-1/2 -translate-y-1/2 pointer-events-none">
<svg
className="w-4 h-4 text-white"
fill="none"
stroke="currentColor"
viewBox="0 0 24 24"
>
<path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M19 9l-7 7-7-7" />
</svg>
</div>
</div>
>
<option value="" disabled selected>
Gender
</option>
<option value="female">female</option>
<option value="male">male</option>
<option value="other">other</option>
</select>

{/* Dropdown arrow */}
<div className="absolute right-3 top-1/2 -translate-y-1/2 pointer-events-none">
<svg
className="w-4 h-4 text-white"
fill="none"
stroke="currentColor"
viewBox="0 0 24 24"
>
<path
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth="2"
d="M19 9l-7 7-7-7"
/>
</svg>
</div>
</div>
</div>

<div className="flex items-center w-[25vw] sm:w-5/6 lg:w-[25vw] justify-between">
<div className="w-[20%] ">
<InputField
placeholder="Country Code"
type="text"
className="w-full rounded-md px-2 py-3 border border-white placeholder:text-gray-400 text-black dark:text-white sm:text-[12px] outline-none autofill:bg-transparent autofill:text-white bg-gray-100 dark:bg-[#1F2A37]"
{...register("countryCode")}
error={errors?.countryCode}
/>
<InputField
placeholder="Country Code"
type="text"
className="w-full rounded-md px-2 py-3 border border-white placeholder:text-gray-400 text-black dark:text-white sm:text-[12px] outline-none autofill:bg-transparent autofill:text-white bg-gray-100 dark:bg-[#1F2A37]"
{...register("countryCode")}
error={errors?.countryCode}
/>
</div>
<div className=" w-[65%]">
<InputField
Expand Down Expand Up @@ -380,7 +405,11 @@ function SignupForm() {
</Button>
</>
) : (
<Button type="submit" label="Signup" className="my-1 mb-4 sm:w-full w-5/6 " />
<Button
type="submit"
label="Signup"
className="my-1 mb-4 sm:w-full w-5/6 "
/>
)}
</div>
</form>
Expand Down
4 changes: 2 additions & 2 deletions src/redux/actions/traineeAttributes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@ export const createTraineeAttribute = (attributeData: any) => async (dispatch: A
const { data } = response.data;
if (data?.createTraineeAttribute) {
dispatch({ type: CREATE_TRAINEE_ATTRIBUTE_SUCCESS, payload: data.createTraineeAttribute });
toast.success("Trainee created successfully.");
toast.success("Application Submited successfully.");
return { success: true, data: data.createTraineeAttribute && data.createTraineeAttribute._id};
} else {
throw new Error("Failed to create trainee attributes: Unexpected response structure");
throw new Error("Failed to create applicant attributes: Unexpected response structure");
}
} catch (error: any) {
handleCreateAttributeError(error, dispatch);
Expand Down
Loading