generated from ita-social-projects/DevTemplate
-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into #534-ImproveFieldsValidationOnRegistratio…
…nFormAndEditProfile
- Loading branch information
Showing
7 changed files
with
335 additions
and
12 deletions.
There are no files selected for viewing
125 changes: 125 additions & 0 deletions
125
FrontEnd/src/components/ProfilePage/FormComponents/ChangePassword.js
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,125 @@ | ||
import axios from 'axios'; | ||
import { PropTypes } from 'prop-types'; | ||
import { toast } from 'react-toastify'; | ||
import { useEffect } from 'react'; | ||
import { useContext } from 'react'; | ||
import { useForm } from 'react-hook-form'; | ||
import { DirtyFormContext } from '../../../context/DirtyFormContext'; | ||
import PasswordField from './FormFields/PasswordField'; | ||
import Loader from '../../loader/Loader'; | ||
import css from './ChangePassword.module.css'; | ||
|
||
|
||
export default function ChangePassword(props) { | ||
const { setFormIsDirty } = useContext(DirtyFormContext); | ||
const { currentFormNameHandler, curForm } = props; | ||
const { | ||
register, | ||
handleSubmit, | ||
getValues, | ||
watch, | ||
reset, | ||
formState: { errors, isDirty }, | ||
} = useForm({ | ||
mode: 'all', | ||
defaultValues: { | ||
currentPassword: '', | ||
newPassword: '', | ||
reNewPassword: '' | ||
} | ||
}); | ||
|
||
useEffect(() => { | ||
currentFormNameHandler(curForm); | ||
}, [currentFormNameHandler, curForm]); | ||
|
||
useEffect(() => { | ||
setFormIsDirty(isDirty); | ||
}, [isDirty, setFormIsDirty] | ||
); | ||
|
||
const handleFormSubmit = () => { | ||
axios.post(`${process.env.REACT_APP_BASE_API_URL}/api/auth/users/set_password/`, { | ||
current_password: getValues('currentPassword'), | ||
new_password: getValues('newPassword'), | ||
re_new_password: getValues('reNewPassword') | ||
}) | ||
.then(() => toast.success('Пароль успішно змінено')) | ||
.catch(() => toast.error('Виникла помилка. Можливо, вказано невірний поточний пароль')); | ||
reset(); | ||
}; | ||
|
||
return ( | ||
<div className={css['form__container']}> | ||
{props.user | ||
? | ||
<form id="ChangePassword" onSubmit={handleSubmit(handleFormSubmit)}> | ||
<PasswordField | ||
inputId="currentPassword" | ||
name="currentPassword" | ||
label="Поточний пароль" | ||
register={register} | ||
error={errors} | ||
showError={false} | ||
watch={watch} | ||
checkValid={false} | ||
checkMatch={ | ||
{ | ||
isCheck: false, | ||
checkWith: null | ||
} | ||
} | ||
/> | ||
<PasswordField | ||
inputId="newPassword" | ||
name="newPassword" | ||
label="Новий пароль" | ||
error={errors} | ||
register={register} | ||
showError={true} | ||
watch={watch} | ||
checkValid={true} | ||
checkMatch={ | ||
{ | ||
isCheck: false, | ||
checkWith: null | ||
} | ||
} | ||
/> | ||
<PasswordField | ||
inputId="reNewPassword" | ||
name="reNewPassword" | ||
label="Повторіть новий пароль" | ||
error={errors} | ||
register={register} | ||
showError={true} | ||
watch={watch} | ||
checkValid={false} | ||
checkMatch={ | ||
{ | ||
isCheck: true, | ||
checkWith: 'newPassword' | ||
} | ||
} | ||
/> | ||
</form> | ||
: <Loader /> | ||
} | ||
</div> | ||
); | ||
} | ||
|
||
ChangePassword.propTypes = { | ||
user: PropTypes.shape({ | ||
id: PropTypes.number.isRequired, | ||
email: PropTypes.string.isRequired, | ||
name: PropTypes.string.isRequired, | ||
surname: PropTypes.string.isRequired, | ||
profile_id: PropTypes.number.isRequired, | ||
is_staff: PropTypes.bool.isRequired | ||
}).isRequired, | ||
currentFormNameHandler: PropTypes.func.isRequired, | ||
curForm: PropTypes.string.isRequired | ||
}; | ||
|
||
|
5 changes: 5 additions & 0 deletions
5
FrontEnd/src/components/ProfilePage/FormComponents/ChangePassword.module.css
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,5 @@ | ||
.form__container { | ||
word-wrap: break-word; | ||
width: 530px; | ||
margin-left: 10px; | ||
} |
102 changes: 102 additions & 0 deletions
102
FrontEnd/src/components/ProfilePage/FormComponents/FormFields/PasswordField.js
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,102 @@ | ||
import { useState } from 'react'; | ||
import { PropTypes } from 'prop-types'; | ||
import EyeInvisible from '../../../authorization/EyeInvisible'; | ||
import EyeVisible from '../../../authorization/EyeVisible'; | ||
import css from './PasswordField.module.css'; | ||
import { PASSWORD_PATTERN } from '../../../../constants/constants'; | ||
|
||
const PasswordField = (props) => { | ||
|
||
const errorMessages = { | ||
invalidPassword: 'Пароль не відповідає вимогам', | ||
passwordsDontMatch: 'Паролі не співпадають' | ||
}; | ||
|
||
const [showPassword, setShowPassword] = useState(false); | ||
|
||
const togglePassword = () => { | ||
setShowPassword(!showPassword); | ||
}; | ||
|
||
const { | ||
register, | ||
name, | ||
error, | ||
showError, | ||
watch, | ||
label, | ||
inputId, | ||
checkValid, | ||
checkMatch | ||
} = props; | ||
|
||
return ( | ||
<div className={css['password-field__item']}> | ||
<div className={css['password-field__label-wrapper']}> | ||
<span> | ||
* | ||
</span> | ||
<label | ||
htmlFor={inputId} | ||
> | ||
{label} | ||
</label> | ||
</div> | ||
<div className={css['password-field__password']}> | ||
<div className={css['password-field__password__wrapper']}> | ||
<input | ||
id={inputId} | ||
type={showPassword ? 'text' : 'password'} | ||
placeholder={label} | ||
required | ||
{...register(name, | ||
{ | ||
pattern: checkValid && { | ||
value: PASSWORD_PATTERN, | ||
message: errorMessages.invalidPassword | ||
}, | ||
validate: checkMatch.isCheck ? | ||
(value) => { | ||
return value === watch(checkMatch.checkWith) || | ||
value === '' || | ||
errorMessages.passwordsDontMatch; | ||
} : | ||
null | ||
})} | ||
/> | ||
</div> | ||
<span | ||
aria-label="Toggle password visibility" | ||
className={css['password-visibility']} | ||
onClick={togglePassword} | ||
> | ||
{!showPassword ? <EyeInvisible /> : <EyeVisible />} | ||
</span> | ||
</div> | ||
{(error[name] && showError) ? | ||
<div className={css['error-message']}> | ||
{error[name].message} | ||
</div> | ||
: | ||
null | ||
} | ||
</div> | ||
); | ||
}; | ||
|
||
PasswordField.propTypes = { | ||
name: PropTypes.string.isRequired, | ||
label: PropTypes.string.isRequired, | ||
register: PropTypes.func.isRequired, | ||
watch: PropTypes.func.isRequired, | ||
inputId: PropTypes.string.isRequired, | ||
showError: PropTypes.bool.isRequired, | ||
error: PropTypes.object, | ||
checkValid: PropTypes.bool.isRequired, | ||
checkMatch: PropTypes.shape({ | ||
isCheck: PropTypes.bool.isRequired, | ||
checkWith: PropTypes.string | ||
}) | ||
}; | ||
|
||
export default PasswordField; |
83 changes: 83 additions & 0 deletions
83
FrontEnd/src/components/ProfilePage/FormComponents/FormFields/PasswordField.module.css
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,83 @@ | ||
.password-field__item { | ||
display: flex; | ||
width: 257px; | ||
height: 89px; | ||
flex-direction: column; | ||
align-items: flex-start; | ||
} | ||
|
||
.password-field__label-wrapper { | ||
padding-bottom: 9px; | ||
} | ||
|
||
.password-field__label-wrapper span { | ||
padding-right: 5px; | ||
color: #FF4D4F; | ||
} | ||
|
||
.password-field__item input { | ||
border: none; | ||
} | ||
.password-field__item input:focus { | ||
border: none; | ||
outline: none; | ||
} | ||
|
||
.password-field__item input::placeholder { | ||
font-style: normal; | ||
font-family: "Inter", sans-serif; | ||
font-size: 14px; | ||
font-weight: 400; | ||
line-height: 22px; | ||
letter-spacing: -0.01em; | ||
text-align: left; | ||
color: #00000040; | ||
} | ||
.password-field__password { | ||
display: flex; | ||
padding: 4px 12px; | ||
align-items: center; | ||
gap: 4px; | ||
align-self: stretch; | ||
border-radius: 2px; | ||
border: 1px solid #d9d9d9; | ||
background: #fff; | ||
} | ||
|
||
.password-field__password:focus { | ||
border-radius: 2px; | ||
border: 1px solid #1f9a7c; | ||
background: #fff; | ||
outline: none; | ||
} | ||
|
||
.password-field__password:focus-within { | ||
border-radius: 2px; | ||
border: 1px solid #1f9a7c; | ||
background: #fff; | ||
} | ||
|
||
.password-field__password__wrapper { | ||
display: flex; | ||
} | ||
|
||
.password-visibility { | ||
cursor: pointer; | ||
margin-left: auto; | ||
} | ||
|
||
.error-message { | ||
display: flex; | ||
padding: 1px 0px; | ||
align-items: flex-start; | ||
gap: 10px; | ||
align-self: stretch; | ||
flex: 1 0 0; | ||
color: var(--red-red-100, #F34444); | ||
font-family: Roboto; | ||
font-size: 14px; | ||
font-style: normal; | ||
font-weight: 400; | ||
line-height: 22px; | ||
} | ||
|
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
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
Oops, something went wrong.