diff options
Diffstat (limited to 'src/components/settings')
| -rw-r--r-- | src/components/settings/ChangePassword.tsx | 79 | ||||
| -rw-r--r-- | src/components/settings/SecurityPage.tsx | 26 | ||||
| -rw-r--r-- | src/components/settings/SetPasswordField.tsx | 76 |
3 files changed, 121 insertions, 60 deletions
diff --git a/src/components/settings/ChangePassword.tsx b/src/components/settings/ChangePassword.tsx index d437b5e..7721c85 100644 --- a/src/components/settings/ChangePassword.tsx +++ b/src/components/settings/ChangePassword.tsx @@ -21,8 +21,8 @@ export const ChangePasswordField = () => { return; } - if (newPassword.length < 6) { - setError('Пароль должен быть минимум 6 символов'); + if (newPassword.length < 8) { + setError('Пароль должен быть минимум 8 символов'); return; } @@ -47,45 +47,50 @@ export const ChangePasswordField = () => { }; return ( - <div className="flex flex-col gap-[20px] w-[310px]"> - <p className="text-light-violet font-medium">СМЕНА ПАРОЛЯ</p> + <> + <div className="flex flex-col gap-[20px] w-[310px]"> + <p className="text-light-violet font-medium">СМЕНА ПАРОЛЯ</p> - <div className="flex flex-col gap-[10px]"> - <InputField - placeholder="Текущий пароль" - isPassword - type="password" - name="currentPassword" - value={currentPassword} - onChange={(e: any) => setCurrentPassword(e.target.value)} - /> + <div className="flex flex-col gap-[10px]"> + <InputField + placeholder="Текущий пароль" + isPassword + type="password" + name="currentPassword" + value={currentPassword} + onChange={(e: any) => + setCurrentPassword(e.target.value) + } + /> - <InputField - placeholder="Новый пароль" - isPassword - type="password" - name="newPassword" - value={newPassword} - onChange={(e: any) => setNewPassword(e.target.value)} - /> + <InputField + placeholder="Новый пароль" + isPassword + type="password" + name="newPassword" + value={newPassword} + onChange={(e: any) => setNewPassword(e.target.value)} + /> - <InputField - placeholder="Повторите пароль" - isPassword - type="password" - name="confirmPassword" - value={confirmPassword} - onChange={(e: any) => setConfirmPassword(e.target.value)} - /> - </div> - - {error && <p className="text-red text-sm">{error}</p>} + <InputField + placeholder="Повторите пароль" + isPassword + type="password" + name="confirmPassword" + value={confirmPassword} + onChange={(e: any) => + setConfirmPassword(e.target.value) + } + /> + </div> - <Button onClick={handleSubmit} disabled={loading}> - {loading ? 'Смена...' : 'Сменить'} - </Button> + {error && <p className="text-red text-sm">{error}</p>} - <Separator className="bg-violet/30 h-[1px]" /> - </div> + <Button onClick={handleSubmit} disabled={loading}> + {loading ? 'Смена...' : 'Сменить'} + </Button> + </div> + <Separator className="bg-violet/30 h-[1px] w-[900px]" /> + </> ); }; diff --git a/src/components/settings/SecurityPage.tsx b/src/components/settings/SecurityPage.tsx index dd650c4..9c498aa 100644 --- a/src/components/settings/SecurityPage.tsx +++ b/src/components/settings/SecurityPage.tsx @@ -6,6 +6,7 @@ import LogoutButton from './LogoutButton'; import { changeEmail } from '@/lib/api/ChangeEmail'; import { useState } from 'react'; import { ChangePasswordField } from './ChangePassword'; +import { SetPasswordField } from './SetPasswordField'; export default function SecurityPage() { const { user } = useAuthContext(); @@ -42,28 +43,7 @@ export default function SecurityPage() { <> <div className="flex flex-col flex-start gap-[40px] w-[900px] h-[816px]"> <div className="flex flex-col gap-[20px] w-[900px] "> - {showSetPassword && ( - <div className="flex flex-col flex-start gap-[20px] w-[310px] h-[241px]"> - <p className="text-light-violet font-medium"> - ЗАДАТЬ ПАРОЛЬ - </p> - <div className="flex flex-col flex-start gap-[10px] w-[310px] h-[137px]"> - <InputField - placeholder="Введите пароль" - type="password" - name="password" - /> - <InputField - isPassword - placeholder="Повторите пароль" - type="password" - name="repeat_password" - /> - </div> - <Button>Сменить</Button> - <Separator className="bg-violet/30 h-[1px]" /> - </div> - )} + {showSetPassword && <SetPasswordField />} <div className="flex flex-col gap-[20px] w-[310px]"> <p className="text-light-violet font-medium"> @@ -91,7 +71,7 @@ export default function SecurityPage() { <Button onClick={handleChangeEmail}>Сменить</Button> </div> - <Separator className="bg-violet/30 h-[1px]" /> + <Separator className="bg-violet/30 h-[1px] w-[900px]" /> {hasPassword && <ChangePasswordField />} <LogoutButton /> </div> diff --git a/src/components/settings/SetPasswordField.tsx b/src/components/settings/SetPasswordField.tsx new file mode 100644 index 0000000..6030c8f --- /dev/null +++ b/src/components/settings/SetPasswordField.tsx @@ -0,0 +1,76 @@ +'use client'; + +import { useState } from 'react'; +import { InputField } from '@/components/ui/inputfield'; +import { Button } from '@/components/ui/button'; +import { Separator } from '@/components/ui/separator'; +import { setPassword } from '@/lib/api/SetPassword'; + +export const SetPasswordField = () => { + const [newPassword, setNewPassword] = useState(''); + const [repeatPassword, setRepeatPassword] = useState(''); + const [loading, setLoading] = useState(false); + const [error, setError] = useState<string | null>(null); + + const handleSubmit = async () => { + setError(null); + + if (newPassword !== repeatPassword) { + setError('Пароли не совпадают'); + return; + } + + if (newPassword.length < 8) { + setError('Пароль должен быть минимум 8 символов'); + return; + } + + setLoading(true); + + const res = await setPassword(newPassword, repeatPassword); + + setLoading(false); + + if (res.error) { + setError(res.error.general); + return; + } + + setNewPassword(''); + setRepeatPassword(''); + }; + + return ( + <div className="flex flex-col gap-[20px] w-[310px]"> + <p className="text-light-violet font-medium">ЗАДАТЬ ПАРОЛЬ</p> + + <div className="flex flex-col gap-[10px]"> + <InputField + placeholder="Введите пароль" + isPassword + type="password" + name="new_password" + value={newPassword} + onChange={(e: any) => setNewPassword(e.target.value)} + /> + + <InputField + placeholder="Повторите пароль" + isPassword + type="password" + name="repeat_password" + value={repeatPassword} + onChange={(e: any) => setRepeatPassword(e.target.value)} + /> + </div> + + {error && <p className="text-red text-sm">{error}</p>} + + <Button onClick={handleSubmit} disabled={loading}> + {loading ? 'Сохранение...' : 'Сменить'} + </Button> + + <Separator className="bg-violet/30 h-[1px] w-[900px]" /> + </div> + ); +}; |
