Skip to content
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

Fix/password visibility #1533

Closed
wants to merge 7 commits into from
Closed

Fix/password visibility #1533

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
333b416
fix: merge conflict and update branch with dev
harjibbolar26 Aug 24, 2024
35a9344
fix: merge conflict
harjibbolar26 Aug 24, 2024
fb6a64b
Merge branch 'dev' into fix/password-visibility
harjibbolar26 Aug 24, 2024
7bfe357
Merge branch 'dev' into fix/password-visibility
harjibbolar26 Aug 24, 2024
f18bd85
Merge branch 'dev' into fix/password-visibility
incredible-phoenix246 Aug 25, 2024
e59a376
Merge branch 'dev' into fix/password-visibility
harjibbolar26 Aug 25, 2024
04945f4
Merge branch 'dev' into fix/password-visibility
PrudentBird Aug 25, 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
54 changes: 48 additions & 6 deletions src/app/dashboard/(admin)/admin/(settings)/settings/account/_component.tsx/password.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import { zodResolver } from "@hookform/resolvers/zod";
import axios from "axios";
import { Eye, EyeOff } from "lucide-react";
import { useSession } from "next-auth/react";
import { useState } from "react";
import { useForm } from "react-hook-form";
Expand All @@ -13,6 +14,8 @@ import { toast } from "~/components/ui/use-toast";
import { cn } from "~/lib/utils";
import { passwordSchema, type PasswordFormData } from "./schema";

type PasswordField = "current" | "new" | "confirmNew";

const Password = () => {
const { data } = useSession();

Expand All @@ -29,6 +32,12 @@ const Password = () => {
mode: "all",
});

const [showPassword, setShowPassword] = useState({
current: false,
new: false,
confirmNew: false,
});

const submitHandler = async (values: PasswordFormData) => {
try {
setIsPending(true);
Expand Down Expand Up @@ -59,6 +68,13 @@ const Password = () => {
}
};

const togglePasswordVisibility = (field: PasswordField) => {
setShowPassword((previousState) => ({
...previousState,
[field]: !previousState[field],
}));
};

return (
<div className="w-full px-3 pt-[50px] md:px-8">
<div className="mb-8">
Expand All @@ -76,16 +92,26 @@ const Password = () => {
<label className="flex border-0 text-sm font-medium text-foreground">
Current Password
</label>
<div className="flex w-full items-center">
<div className="relative flex w-full items-center">
<input
className={cn(
"flex h-10 w-full flex-col gap-2 rounded-md border border-border bg-background px-4 py-2 text-sm text-foreground ring-offset-background transition-colors file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus:border-primary focus:outline-none focus:ring-1 focus:ring-primary focus-visible:border-primary focus-visible:outline-none disabled:cursor-not-allowed disabled:opacity-50",
errors.currentPassword && "border-red-500",
)}
placeholder="Enter current password"
type="password"
type={`${showPassword.current ? "text" : "password"}`}
{...register("currentPassword")}
/>
<span
className="absolute right-2 top-[10px] cursor-pointer"
onClick={() => togglePasswordVisibility("current")}
>
{showPassword.current ? (
<EyeOff size={20} />
) : (
<Eye size={20} />
)}
</span>
</div>
</div>
{errors.currentPassword && (
Expand All @@ -99,16 +125,22 @@ const Password = () => {
<label className="flex border-0 text-sm font-medium text-foreground">
New Password
</label>
<div className="flex w-full items-center">
<div className="relative flex w-full items-center">
<input
className={cn(
"flex h-10 w-full flex-col gap-2 rounded-md border border-border bg-background px-4 py-2 text-sm text-foreground ring-offset-background transition-colors file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus:border-primary focus:outline-none focus:ring-1 focus:ring-primary focus-visible:border-primary focus-visible:outline-none disabled:cursor-not-allowed disabled:opacity-50",
errors.newPassword && "border-red-500",
)}
placeholder="Enter new password"
type="password"
type={`${showPassword.new ? "text" : "password"}`}
{...register("newPassword")}
/>
<span
className="absolute right-2 top-[10px] cursor-pointer"
onClick={() => togglePasswordVisibility("new")}
>
{showPassword.new ? <EyeOff size={20} /> : <Eye size={20} />}
</span>
</div>
</div>
{errors.newPassword && (
Expand All @@ -122,16 +154,26 @@ const Password = () => {
<label className="flex border-0 text-sm font-medium text-foreground">
Confirm new password
</label>
<div className="flex w-full items-center">
<div className="relative flex w-full items-center">
<input
className={cn(
"flex h-10 w-full flex-col gap-2 rounded-md border border-border bg-background px-4 py-2 text-sm text-foreground ring-offset-background transition-colors file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus:border-primary focus:outline-none focus:ring-1 focus:ring-primary focus-visible:border-primary focus-visible:outline-none disabled:cursor-not-allowed disabled:opacity-50",
errors.confirmPassword && "border-red-500",
)}
placeholder="Confrim new Password"
type="password"
type={`${showPassword.confirmNew ? "text" : "password"}`}
{...register("confirmPassword")}
/>
<span
className="absolute right-2 top-[10px] cursor-pointer"
onClick={() => togglePasswordVisibility("confirmNew")}
>
{showPassword.confirmNew ? (
<EyeOff size={20} />
) : (
<Eye size={20} />
)}
</span>
</div>
</div>
{errors.confirmPassword && (
Expand Down
Loading