-
Notifications
You must be signed in to change notification settings - Fork 125
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.
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
Feat/116 user dashboard password settings page #243
Merged
SirhmVFX
merged 10 commits into
dev
from
feat/116-User-Dashboard-Password-Settings-Page
Jul 21, 2024
Merged
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
551c3da
feat(116):user-dashboard-password-settings added route for it
Lftobs bbe66a8
feat(116):user-dashboard-password-settings (added component dir for d…
Lftobs aa6d984
feat(116):user-dashboard-password-settings (completed password update…
Lftobs be36ee3
feat(116):user-dashboard-password-settings (completed password update…
Lftobs 54e57b0
Merge branch 'dev' into feat/116-User-Dashboard-Password-Settings-Page
Lftobs 6d07901
feat(116):user-dashboard-password-settings (completed password update…
Lftobs 0c16aa1
Merge branch 'dev' into feat/116-User-Dashboard-Password-Settings-Page
Lftobs ae70e8d
feat(116):user-dashboard-password-settings (completed password update…
Lftobs f950fb1
Merge branch 'dev' into feat/116-User-Dashboard-Password-Settings-Page
Lftobs 1528c18
feat(116):user-dashboard-password-settings (completed password update…
Lftobs File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,323 @@ | ||
import { Form } from "@remix-run/react"; | ||
import { CircleCheck, Eye, EyeOff } from "lucide-react"; | ||
import { useEffect, useState } from "react"; | ||
|
||
import { | ||
AlertDialog, | ||
AlertDialogCancel, | ||
AlertDialogContent, | ||
AlertDialogDescription, | ||
AlertDialogFooter, | ||
AlertDialogHeader, | ||
AlertDialogTitle, | ||
AlertDialogTrigger, | ||
} from "../ui/alert-dialog"; | ||
import { Button } from "../ui/button"; | ||
|
||
interface PasswordValues { | ||
currentPassword: string; | ||
newPassword: string; | ||
confirmPassword: string; | ||
} | ||
|
||
const PasswordUpdate = () => { | ||
const [showPassword, setShowPassword] = useState<boolean>(false); | ||
const [showNewPassword, setShowNewPassword] = useState<boolean>(false); | ||
const [showConfirmPassword, setShowConfirmPassword] = | ||
useState<boolean>(false); | ||
const [validation, setValidation] = useState({ | ||
hasUppercase: false, | ||
hasNumber: false, | ||
hasMinLength: false, | ||
}); | ||
const [displayValue, setDisplayValue] = useState<PasswordValues>({ | ||
currentPassword: "", | ||
newPassword: "", | ||
confirmPassword: "", | ||
}); | ||
|
||
const [actualValue, setActualValue] = useState<PasswordValues>({ | ||
currentPassword: "", | ||
newPassword: "", | ||
confirmPassword: "", | ||
}); | ||
|
||
const handlePasswordValidation = (value: string) => { | ||
const hasUppercase = /[A-Z]/.test(value); | ||
const hasNumber = /\d/.test(value); | ||
const hasMinLength = value.length >= 8; | ||
setValidation({ | ||
hasUppercase, | ||
hasNumber, | ||
hasMinLength, | ||
}); | ||
}; | ||
|
||
const handleChange = (event: React.ChangeEvent<HTMLInputElement>) => { | ||
event.preventDefault(); | ||
const { name, value } = event.target; | ||
const value_: keyof PasswordValues = name as keyof PasswordValues; | ||
|
||
setActualValue((previousActualValue) => ({ | ||
...previousActualValue, | ||
[name]: | ||
(actualValue[value_] + value.at(-1)).length > value.length | ||
? actualValue[value_].slice(0, -1) | ||
: actualValue[value_] + value.at(-1), | ||
})); | ||
|
||
setDisplayValue((previousDisplayValue) => ({ | ||
...previousDisplayValue, | ||
[name]: "*".repeat(value.length), | ||
})); | ||
if (name === "newPassword") { | ||
handlePasswordValidation(actualValue[value_]); | ||
} | ||
}; | ||
useEffect(() => { | ||
const inputs = document.querySelectorAll<HTMLInputElement>(".psw-input"); | ||
for (const element of inputs) { | ||
element.addEventListener( | ||
"select", | ||
function () { | ||
this.select = () => {}; | ||
this.selectionStart = this.selectionEnd; | ||
}, | ||
false, | ||
); | ||
} | ||
}, []); | ||
return ( | ||
<div className="w-full bg-white pl-10"> | ||
<h1 className="mb-1 mt-10 text-2xl font-bold text-[rgba(20,20,20,1)]"> | ||
Password Settings | ||
</h1> | ||
<p className="mb-5 text-base text-[rgba(67,67,67,1)]"> | ||
Update password for enhanced account security | ||
</p> | ||
<Form className="flex w-2/3 flex-col gap-4 max-md:w-5/6"> | ||
<label className="flex flex-col gap-2"> | ||
<p className="text-base text-[rgba(67,67,67,1)]">Current Password</p> | ||
<div | ||
className={`border-[1px] ${actualValue.currentPassword.length < 5 && actualValue.currentPassword.length > 0 ? "border-[rgba(220,38,38,1)]" : "border-[rgba(147,147,147,1)]"} flex select-none items-center justify-between rounded-lg p-1 pr-5`} | ||
> | ||
<input | ||
type="text" | ||
name="currentPassword" | ||
value={ | ||
showPassword | ||
? actualValue.currentPassword | ||
: displayValue.currentPassword | ||
} | ||
onChange={handleChange} | ||
placeholder="Enter current password" | ||
className="psw-input hi h-12 w-11/12 !select-none rounded-lg border-none bg-slate-600 bg-transparent px-5 text-[rgba(147,147,147,1)] outline-none" | ||
/> | ||
|
||
{showPassword ? ( | ||
<Eye | ||
size={24} | ||
color="rgba(147,147,147,1)" | ||
onClick={() => setShowPassword(!showPassword)} | ||
/> | ||
) : ( | ||
<EyeOff | ||
size={24} | ||
color="rgba(147,147,147,1)" | ||
onClick={() => setShowPassword(!showPassword)} | ||
/> | ||
)} | ||
</div> | ||
{actualValue.currentPassword.length < 5 && | ||
actualValue.currentPassword.length > 0 ? ( | ||
<p className="text-sm font-[500] text-[rgba(220,38,38,1)]"> | ||
Invalid password | ||
</p> | ||
) : ( | ||
<></> | ||
)} | ||
</label> | ||
|
||
<label className="flex flex-col gap-2"> | ||
<p className="text-base text-[rgba(67,67,67,1)]">New Password</p> | ||
<div className="flex select-none items-center justify-between rounded-lg border-[1px] border-[rgba(147,147,147,1)] p-1 pr-5"> | ||
<input | ||
type="text" | ||
name="newPassword" | ||
value={ | ||
showNewPassword | ||
? actualValue.newPassword | ||
: displayValue.newPassword | ||
} | ||
onChange={handleChange} | ||
placeholder="Enter new password" | ||
onFocus={() => { | ||
// setIsFocused(true); | ||
}} | ||
className="psw-input hi h-12 w-11/12 !select-none rounded-lg border-none bg-slate-600 bg-transparent px-5 text-[rgba(147,147,147,1)] outline-none" | ||
/> | ||
|
||
{showNewPassword ? ( | ||
<Eye | ||
size={24} | ||
color="rgba(147,147,147,1)" | ||
onClick={() => setShowNewPassword(!showNewPassword)} | ||
/> | ||
) : ( | ||
<EyeOff | ||
size={24} | ||
color="rgba(147,147,147,1)" | ||
onClick={() => setShowNewPassword(!showNewPassword)} | ||
/> | ||
)} | ||
</div> | ||
{displayValue.newPassword.length > 0 && ( | ||
<div> | ||
<div className="flex gap-3"> | ||
<span | ||
className={`h-1 w-24 rounded ${actualValue.newPassword.length > 0 ? (validation.hasUppercase ? "bg-[rgba(109,195,71,1)]" : "bg-[rgba(220,38,38,1)]") : "bg-[rgba(182,182,182,1)]"} flex`} | ||
></span> | ||
<span | ||
className={`h-1 w-24 rounded ${actualValue.newPassword.length > 0 ? (validation.hasNumber ? "bg-[rgba(109,195,71,1)]" : "bg-[rgba(220,38,38,1)]") : "bg-[rgba(182,182,182,1)]"} flex`} | ||
></span> | ||
<span | ||
className={`h-1 w-24 rounded ${actualValue.newPassword.length > 0 ? (validation.hasMinLength ? "bg-[rgba(109,195,71,1)]" : "bg-[rgba(220,38,38,1)]") : "bg-[rgba(182,182,182,1)]"} flex`} | ||
></span> | ||
</div> | ||
<div className="mt-3 grid gap-2"> | ||
<p className="mb-1 text-sm">Weak password. Must contain;</p> | ||
<div className="flex gap-2"> | ||
{validation.hasUppercase ? ( | ||
<CircleCheck color="rgba(109,195,71,1)" /> | ||
) : ( | ||
<CircleCheck color="rgba(220,38,38,1)" /> | ||
)} | ||
<p className="text-sm">At least 1 uppercase</p> | ||
</div> | ||
<div className="flex gap-2"> | ||
{validation.hasNumber ? ( | ||
<CircleCheck color="rgba(109,195,71,1)" /> | ||
) : ( | ||
<CircleCheck color="rgba(220,38,38,1)" /> | ||
)} | ||
<p className="text-sm">At least 1 number</p> | ||
</div> | ||
<div className="flex gap-2"> | ||
{validation.hasMinLength ? ( | ||
<CircleCheck color="rgba(109,195,71,1)" /> | ||
) : ( | ||
<CircleCheck color="rgba(220,38,38,1)" /> | ||
)} | ||
<p className="text-sm">At least 8 characters</p> | ||
</div> | ||
</div> | ||
</div> | ||
)} | ||
</label> | ||
|
||
<label className="flex flex-col gap-2"> | ||
<p className="text-base text-[rgba(67,67,67,1)]">Confirm Password</p> | ||
<div | ||
className={`border-[1px] ${actualValue.confirmPassword.length > 0 ? (actualValue.newPassword == actualValue.confirmPassword ? "border-[rgba(147,147,147,1)]" : "border-[rgba(220,38,38,1)]") : "border-[rgba(147,147,147,1)]"} flex select-none items-center justify-between rounded-lg p-1 pr-5`} | ||
> | ||
<input | ||
type="text" | ||
name="confirmPassword" | ||
value={ | ||
showConfirmPassword | ||
? actualValue.confirmPassword | ||
: displayValue.confirmPassword | ||
} | ||
onChange={handleChange} | ||
placeholder="Enter confirm password" | ||
className="psw-input hi h-12 w-11/12 !select-none rounded-lg border-none bg-slate-600 bg-transparent px-5 text-[rgba(147,147,147,1)] outline-none" | ||
/> | ||
|
||
{showConfirmPassword ? ( | ||
<Eye | ||
size={24} | ||
color="rgba(147,147,147,1)" | ||
onClick={() => setShowConfirmPassword(!showConfirmPassword)} | ||
/> | ||
) : ( | ||
<EyeOff | ||
size={24} | ||
color="rgba(147,147,147,1)" | ||
onClick={() => setShowConfirmPassword(!showConfirmPassword)} | ||
/> | ||
)} | ||
</div> | ||
{actualValue.confirmPassword.length > 0 ? ( | ||
actualValue.newPassword != actualValue.confirmPassword && ( | ||
<p className="text-sm font-[500] text-[rgba(220,38,38,1)]"> | ||
Password does not match | ||
</p> | ||
) | ||
) : ( | ||
<></> | ||
)} | ||
</label> | ||
|
||
<AlertDialog> | ||
<div className="mt-6 flex gap-5"> | ||
<Button | ||
type="submit" | ||
variant="outline" | ||
size="default" | ||
className="h-12 w-24 rounded-lg bg-transparent text-base font-bold text-black" | ||
> | ||
Cancel | ||
</Button> | ||
<AlertDialogTrigger asChild> | ||
<Button | ||
type="submit" | ||
onClick={() => { | ||
setActualValue({ | ||
currentPassword: "", | ||
newPassword: "", | ||
confirmPassword: "", | ||
}); | ||
setDisplayValue({ | ||
currentPassword: "", | ||
newPassword: "", | ||
confirmPassword: "", | ||
}); | ||
}} | ||
variant="default" | ||
size="default" | ||
className="h-12 w-44 rounded-lg bg-[rgba(249,115,22,1)] text-base font-bold text-white" | ||
> | ||
Update Password | ||
</Button> | ||
</AlertDialogTrigger> | ||
</div> | ||
<AlertDialogContent className="sm:max-w-md"> | ||
<AlertDialogHeader> | ||
<AlertDialogTitle> | ||
Password Successfully Updated! | ||
</AlertDialogTitle> | ||
<AlertDialogDescription> | ||
Your password has been successfully updated! You can now log in | ||
with your new password. | ||
</AlertDialogDescription> | ||
</AlertDialogHeader> | ||
|
||
<AlertDialogFooter className="sm:justify-end"> | ||
<AlertDialogCancel asChild className="flex flex-row-reverse"> | ||
<Button | ||
type="button" | ||
variant="default" | ||
className="bg-[rgba(249,115,22,1)] px-6 font-semibold" | ||
> | ||
Continue | ||
</Button> | ||
</AlertDialogCancel> | ||
</AlertDialogFooter> | ||
</AlertDialogContent> | ||
</AlertDialog> | ||
</Form> | ||
</div> | ||
); | ||
}; | ||
|
||
export default PasswordUpdate; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
import PasswordUpdate from "~/components/dashboard/PasswordUpdate"; | ||
|
||
const DaashboardPasswordSettings = () => { | ||
return ( | ||
<> | ||
<div className="grid h-16 place-items-center font-extrabold">Nav</div> | ||
<div className="flex"> | ||
<div className="grid h-svh w-[20%] place-items-center bg-[rgba(203,213,225,.3)] font-extrabold max-lg:hidden"> | ||
Sidebar | ||
</div> | ||
<PasswordUpdate /> | ||
</div> | ||
</> | ||
); | ||
}; | ||
|
||
export default DaashboardPasswordSettings; |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No side bar component
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
its a component in issue #5 and #146