🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
improve password
Bill Yangd1353f0ce868
diff --git a/client/src/app/settings/account/ChangePassword.tsx b/client/src/app/settings/account/ChangePassword.tsxindex 6b4f99360..b439dcf08 100644--- a/client/src/app/settings/account/ChangePassword.tsx+++ b/client/src/app/settings/account/ChangePassword.tsx@@ -1,4 +1,4 @@-import { useState } from "react";+import { useState, useEffect } from "react";import { Button } from "../../../components/ui/button";import { authClient } from "../../../lib/auth";import {@@ -13,8 +13,15 @@ import {} from "../../../components/ui/dialog";import { Label } from "../../../components/ui/label";import { Input } from "../../../components/ui/input";-import { KeyRound } from "lucide-react";+import {+ KeyRound,+ CheckCircle2,+ XCircle,+ ShieldAlert,+ ShieldCheck,+} from "lucide-react";import { toast } from "sonner";+import { cn } from "@/lib/utils";export function ChangePassword() {const [open, setOpen] = useState(false);@@ -22,16 +29,63 @@ export function ChangePassword() {const [newPassword, setNewPassword] = useState("");const [confirmPassword, setConfirmPassword] = useState("");const [isSubmitting, setIsSubmitting] = useState(false);+ const [passwordStrength, setPasswordStrength] = useState(0);+ const [passwordFeedback, setPasswordFeedback] = useState("");+ // Check if passwords matchconst passwordsMatch = newPassword === confirmPassword;++ // Calculate password strength+ useEffect(() => {+ if (!newPassword) {+ setPasswordStrength(0);+ setPasswordFeedback("");+ return;+ }++ let strength = 0;+ let feedback = "";++ // Length check+ if (newPassword.length >= 8) {+ strength += 1;+ } else {+ feedback = "Password should be at least 8 characters";+ }++ // Complexity checks+ if (/[A-Z]/.test(newPassword)) strength += 1;+ if (/[a-z]/.test(newPassword)) strength += 1;+ if (/[0-9]/.test(newPassword)) strength += 1;+ if (/[^A-Za-z0-9]/.test(newPassword)) strength += 1;++ if (strength >= 4 && newPassword.length >= 8) {+ feedback = "Strong password";+ } else if (strength >= 3 && newPassword.length >= 8) {+ feedback = "Good password";+ } else if (newPassword.length >= 8) {+ feedback =+ "Add uppercase, lowercase, numbers, or symbols for a stronger password";+ }++ setPasswordStrength(strength);+ setPasswordFeedback(feedback);+ }, [newPassword]);+const canSubmit =- currentPassword && newPassword && confirmPassword && passwordsMatch;+ currentPassword &&+ newPassword &&+ confirmPassword &&+ passwordsMatch &&+ passwordStrength >= 3;const resetForm = () => {setCurrentPassword("");setNewPassword("");setConfirmPassword("");setIsSubmitting(false);+ setPasswordStrength(0);+ setPasswordFeedback("");};const handleSubmit = async () => {@@ -40,6 +94,11 @@ export function ChangePassword() {return;}+ if (passwordStrength < 3) {+ toast.error("Please use a stronger password");+ return;+ }+try {setIsSubmitting(true);const response = await authClient.changePassword({@@ -62,6 +121,14 @@ export function ChangePassword() {}};+ // Get color based on password strength+ const getStrengthColor = () => {+ if (passwordStrength === 0) return "bg-neutral-200 dark:bg-neutral-700";+ if (passwordStrength <= 2) return "bg-red-500";+ if (passwordStrength === 3) return "bg-yellow-500";+ return "bg-green-500";+ };+return (<Dialogopen={open}@@ -84,52 +151,155 @@ export function ChangePassword() {</DialogDescription></DialogHeader>- <div className="space-y-4 py-4">+ <div className="space-y-5 py-4"><div className="space-y-2">- <Label htmlFor="currentPassword">Current Password</Label>- <Input- id="currentPassword"- value={currentPassword}- onChange={(e) => setCurrentPassword(e.target.value)}- type="password"- placeholder="Your current password"- />+ <Label+ htmlFor="currentPassword"+ className="text-sm font-medium flex items-center"+ >+ Current Password+ </Label>+ <div className="relative">+ <Input+ id="currentPassword"+ value={currentPassword}+ onChange={(e) => setCurrentPassword(e.target.value)}+ type="password"+ placeholder="Your current password"+ className="pr-10"+ />+ {currentPassword && (+ <div className="absolute right-3 top-1/2 transform -translate-y-1/2 text-neutral-500">+ <CheckCircle2 className="h-4 w-4 text-green-500" />+ </div>+ )}+ </div></div><div className="space-y-2">- <Label htmlFor="newPassword">New Password</Label>- <Input- id="newPassword"- value={newPassword}- onChange={(e) => setNewPassword(e.target.value)}- type="password"- placeholder="Your new password"- />+ <Label+ htmlFor="newPassword"+ className="text-sm font-medium flex items-center justify-between"+ >+ <span>New Password</span>+ {passwordStrength > 0 && (+ <span+ className={cn(+ "text-xs",+ passwordStrength <= 2+ ? "text-red-500"+ : passwordStrength === 3+ ? "text-yellow-500"+ : "text-green-500"+ )}+ >+ {passwordStrength <= 2+ ? "Weak"+ : passwordStrength === 3+ ? "Good"+ : "Strong"}+ </span>+ )}+ </Label>+ <div className="relative">+ <Input+ id="newPassword"+ value={newPassword}+ onChange={(e) => setNewPassword(e.target.value)}+ type="password"+ placeholder="Your new password"+ className="pr-10"+ />+ {newPassword && (+ <div className="absolute right-3 top-1/2 transform -translate-y-1/2 text-neutral-500">+ {passwordStrength >= 3 ? (+ <ShieldCheck className="h-4 w-4 text-green-500" />+ ) : (+ <ShieldAlert className="h-4 w-4 text-yellow-500" />+ )}+ </div>+ )}+ </div>++ {/* Password strength indicator */}+ {newPassword && (+ <>+ <div className="flex space-x-1 mt-1.5">+ {[1, 2, 3, 4].map((index) => (+ <div+ key={index}+ className={cn(+ "h-1.5 w-1/4 rounded-full transition-colors duration-300",+ index <= passwordStrength+ ? getStrengthColor()+ : "bg-neutral-200 dark:bg-neutral-700"+ )}+ />+ ))}+ </div>+ {passwordFeedback && (+ <p+ className={cn(+ "text-xs mt-1",+ passwordStrength <= 2+ ? "text-red-500"+ : passwordStrength === 3+ ? "text-yellow-500"+ : "text-green-500"+ )}+ >+ {passwordFeedback}+ </p>+ )}+ </>+ )}</div><div className="space-y-2">- <Label htmlFor="confirmPassword">Confirm Password</Label>- <Input- id="confirmPassword"- value={confirmPassword}- onChange={(e) => setConfirmPassword(e.target.value)}- type="password"- placeholder="Confirm your new password"- />+ <Label+ htmlFor="confirmPassword"+ className="text-sm font-medium flex items-center"+ >+ Confirm Password+ </Label>+ <div className="relative">+ <Input+ id="confirmPassword"+ value={confirmPassword}+ onChange={(e) => setConfirmPassword(e.target.value)}+ type="password"+ placeholder="Confirm your new password"+ className="pr-10"+ />+ {confirmPassword && (+ <div className="absolute right-3 top-1/2 transform -translate-y-1/2">+ {passwordsMatch ? (+ <CheckCircle2 className="h-4 w-4 text-green-500" />+ ) : (+ <XCircle className="h-4 w-4 text-red-500" />+ )}+ </div>+ )}+ </div>{!passwordsMatch && confirmPassword && (- <p className="text-xs text-red-500">Passwords do not match</p>+ <p className="text-xs text-red-500 mt-1">+ Passwords do not match+ </p>)}</div></div>- <DialogFooter className="space-x-2">+ <DialogFooter className="flex flex-col sm:flex-row gap-2"><DialogClose asChild>- <Button variant="outline">Cancel</Button>+ <Button variant="outline" className="sm:flex-1">+ Cancel+ </Button></DialogClose><ButtononClick={handleSubmit}disabled={!canSubmit || isSubmitting}- variant="accent"+ variant="success"+ className="sm:flex-1">{isSubmitting ? "Changing..." : "Change Password"}</Button>diff --git a/client/src/components/ui/button.tsx b/client/src/components/ui/button.tsxindex a7c987b53..b4183f91e 100644--- a/client/src/components/ui/button.tsx+++ b/client/src/components/ui/button.tsx@@ -15,6 +15,8 @@ const buttonVariants = cva("bg-neutral-100 text-neutral-900 shadow-sm hover:bg-neutral-100/80 dark:bg-neutral-50 dark:text-neutral-800 dark:hover:bg-neutral-50/90",accent:"bg-neutral-500 text-neutral-900 shadow-sm hover:bg-neutral-500/80 dark:bg-fuchsia-600 dark:text-neutral-50 dark:hover:bg-fuchsia-600/90",+ success:+ "bg-green-500 text-neutral-50 shadow-sm hover:bg-green-500/90 dark:bg-green-900 dark:text-neutral-50 dark:hover:bg-green-900/90",destructive:"bg-red-500 text-neutral-50 shadow-sm hover:bg-red-500/90 dark:bg-red-900 dark:text-neutral-50 dark:hover:bg-red-900/90",warning: