feat: ruff'ed
This commit is contained in:
@@ -8,9 +8,9 @@ User = get_user_model()
|
||||
|
||||
|
||||
class ChangePasswordForm(StylingMixin, PasswordChangeForm):
|
||||
styled_fields = ("old_password", "new_password1", "new_password2")
|
||||
styled_fields = ('old_password', 'new_password1', 'new_password2')
|
||||
placeholder_for_field = {
|
||||
"old_password": _("********"),
|
||||
"new_password1": _("********"),
|
||||
"new_password2": _("********"),
|
||||
'old_password': _('********'),
|
||||
'new_password1': _('********'),
|
||||
'new_password2': _('********'),
|
||||
}
|
||||
|
||||
+4
-12
@@ -8,15 +8,11 @@ User = get_user_model()
|
||||
|
||||
|
||||
class UserInfoForm(StylingMixin, forms.ModelForm):
|
||||
styled_fields = ("email", "first_name", "last_name")
|
||||
placeholder_for_field = {
|
||||
"email": _("pablo@shoppy.com"),
|
||||
"first_name": _("Pablo"),
|
||||
"last_name": _("Moreno"),
|
||||
}
|
||||
styled_fields = ('email', 'first_name', 'last_name')
|
||||
placeholder_for_field = {'email': _('pablo@shoppy.com'), 'first_name': _('Pablo'), 'last_name': _('Moreno')}
|
||||
|
||||
def save(self, commit=True):
|
||||
self.instance.username = self.cleaned_data.get("email")
|
||||
self.instance.username = self.cleaned_data.get('email')
|
||||
return super().save(commit)
|
||||
|
||||
def is_valid(self):
|
||||
@@ -24,8 +20,4 @@ class UserInfoForm(StylingMixin, forms.ModelForm):
|
||||
|
||||
class Meta:
|
||||
model = User
|
||||
fields = (
|
||||
"email",
|
||||
"first_name",
|
||||
"last_name",
|
||||
)
|
||||
fields = ('email', 'first_name', 'last_name')
|
||||
|
||||
+6
-18
@@ -7,28 +7,16 @@ from web.mixins import StylingMixin
|
||||
|
||||
class LoginForm(StylingMixin, AuthenticationForm):
|
||||
styled_fields = []
|
||||
placeholder_for_field = {"username": _("pablo@shoppy.com"), "password": "********"}
|
||||
placeholder_for_field = {'username': _('pablo@shoppy.com'), 'password': '********'}
|
||||
|
||||
username = UsernameField(
|
||||
widget=forms.EmailInput(
|
||||
attrs={
|
||||
"autofocus": True,
|
||||
"class": "input-text",
|
||||
}
|
||||
)
|
||||
)
|
||||
username = UsernameField(widget=forms.EmailInput(attrs={'autofocus': True, 'class': 'input-text'}))
|
||||
password = forms.CharField(
|
||||
label=_("Contraseña"),
|
||||
label=_('Contraseña'),
|
||||
strip=False,
|
||||
widget=forms.PasswordInput(
|
||||
attrs={
|
||||
"autocomplete": "current-password",
|
||||
"class": "input-text",
|
||||
}
|
||||
),
|
||||
widget=forms.PasswordInput(attrs={'autocomplete': 'current-password', 'class': 'input-text'}),
|
||||
)
|
||||
remember_me = forms.BooleanField(
|
||||
label=_("Mantener sesión iniciada"),
|
||||
label=_('Mantener sesión iniciada'),
|
||||
required=False,
|
||||
widget=forms.CheckboxInput(attrs={"class": "input-checkbox"}),
|
||||
widget=forms.CheckboxInput(attrs={'class': 'input-checkbox'}),
|
||||
)
|
||||
|
||||
+12
-20
@@ -9,13 +9,13 @@ from web.mixins import StylingMixin
|
||||
|
||||
class RegisterForm(StylingMixin, BaseUserCreationForm, SetPasswordMixin):
|
||||
password1, password2 = SetPasswordMixin.create_password_fields()
|
||||
styled_fields = ["email", "first_name", "last_name", "password1", "password2"]
|
||||
styled_fields = ['email', 'first_name', 'last_name', 'password1', 'password2']
|
||||
placeholder_for_field = {
|
||||
"email": _("pablo@shoppy.com"),
|
||||
"first_name": _("Pablo"),
|
||||
"last_name": _("Moreno"),
|
||||
"password1": "********",
|
||||
"password2": "********",
|
||||
'email': _('pablo@shoppy.com'),
|
||||
'first_name': _('Pablo'),
|
||||
'last_name': _('Moreno'),
|
||||
'password1': '********',
|
||||
'password2': '********',
|
||||
}
|
||||
|
||||
def __init__(self, *args, **kwargs):
|
||||
@@ -24,22 +24,14 @@ class RegisterForm(StylingMixin, BaseUserCreationForm, SetPasswordMixin):
|
||||
self.fields[field_name].required = True
|
||||
self.fields[field_name].widget.attrs.update(
|
||||
{
|
||||
"class": "my-2 bg-gray-50 border border-gray-300 text-gray-900 sm:text-sm rounded-lg "
|
||||
"focus:ring-primary-600 focus:border-primary-600 block w-full p-2.5 dark:bg-gray-700 "
|
||||
"dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-primary-500 "
|
||||
"dark:focus:border-primary-500"
|
||||
'class': 'my-2 bg-gray-50 border border-gray-300 text-gray-900 sm:text-sm rounded-lg '
|
||||
'focus:ring-primary-600 focus:border-primary-600 block w-full p-2.5 dark:bg-gray-700 '
|
||||
'dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-primary-500 '
|
||||
'dark:focus:border-primary-500'
|
||||
}
|
||||
)
|
||||
|
||||
class Meta:
|
||||
model = User
|
||||
fields = (
|
||||
"email",
|
||||
"first_name",
|
||||
"last_name",
|
||||
)
|
||||
field_classes = {
|
||||
"email": EmailField,
|
||||
"first_name": forms.CharField,
|
||||
"last_name": forms.CharField,
|
||||
}
|
||||
fields = ('email', 'first_name', 'last_name')
|
||||
field_classes = {'email': EmailField, 'first_name': forms.CharField, 'last_name': forms.CharField}
|
||||
|
||||
@@ -9,42 +9,26 @@ from web.mixins import StylingMixin
|
||||
|
||||
|
||||
class PasswordResetForm(StylingMixin, BasePasswordResetForm):
|
||||
styled_fields = [
|
||||
"email",
|
||||
]
|
||||
placeholder_for_field = {
|
||||
"email": _("pablo@shoppy.com"),
|
||||
}
|
||||
styled_fields = ['email']
|
||||
placeholder_for_field = {'email': _('pablo@shoppy.com')}
|
||||
|
||||
|
||||
class SetPasswordForm(StylingMixin, BaseSetPasswordForm):
|
||||
styled_fields = [
|
||||
"new_password1",
|
||||
"new_password2",
|
||||
]
|
||||
placeholder_for_field = {
|
||||
"new_password1": "********",
|
||||
"new_password2": "********",
|
||||
}
|
||||
styled_fields = ['new_password1', 'new_password2']
|
||||
placeholder_for_field = {'new_password1': '********', 'new_password2': '********'}
|
||||
|
||||
token = forms.CharField(
|
||||
required=True,
|
||||
widget=forms.HiddenInput(),
|
||||
validators=[],
|
||||
)
|
||||
token = forms.CharField(required=True, widget=forms.HiddenInput(), validators=[])
|
||||
|
||||
def validate_token(self):
|
||||
is_valid = default_token_generator.check_token(
|
||||
self.user, self.data.get("token")
|
||||
)
|
||||
is_valid = default_token_generator.check_token(self.user, self.data.get('token'))
|
||||
|
||||
if not is_valid:
|
||||
raise ValidationError(_("El token no es válido o ha expirado"))
|
||||
raise ValidationError(_('El token no es válido o ha expirado'))
|
||||
|
||||
def is_valid(self):
|
||||
try:
|
||||
self.validate_token()
|
||||
except ValidationError as e:
|
||||
self.add_error("token", str(e))
|
||||
self.add_error('token', str(e))
|
||||
return False
|
||||
return super().is_valid()
|
||||
|
||||
Reference in New Issue
Block a user