feat: ruff'ed

This commit is contained in:
2025-05-02 08:38:57 +02:00
parent 32b36b81b3
commit 48b53d851a
62 changed files with 2019 additions and 3655 deletions
+48 -85
View File
@@ -6,11 +6,7 @@ from django.contrib.auth.tokens import default_token_generator
from django.core.exceptions import ValidationError
from django.db import IntegrityError
from django.shortcuts import redirect, render, reverse
from django.utils.http import (
url_has_allowed_host_and_scheme,
urlencode,
urlsafe_base64_decode,
)
from django.utils.http import url_has_allowed_host_and_scheme, urlencode, urlsafe_base64_decode
from django.utils.text import gettext_lazy as _
from django.views.generic import TemplateView, View
@@ -22,22 +18,22 @@ User = get_user_model()
class RedirectionMixin:
redirect_to = ""
redirect_to = ''
def get_redirection(self):
return reverse(self.redirect_to)
class LoginView(View, RedirectionMixin):
template_name = "users/login.html"
redirect_to = "web:index"
template_name = 'users/login.html'
redirect_to = 'web:index'
login_form_class = LoginForm
def get_redirection(self):
next_page = self.request.GET.get("next", "")
next_page = self.request.GET.get('next', '')
if next_page:
return f"{reverse(self.redirect_to)}?next={next_page}"
return f'{reverse(self.redirect_to)}?next={next_page}'
return reverse(self.redirect_to)
@@ -54,11 +50,7 @@ class LoginView(View, RedirectionMixin):
return render(
request,
self.template_name,
{
"form": login_form,
"title": web_settings.web_title,
"description": _("inicio de sesión"),
},
{'form': login_form, 'title': web_settings.web_title, 'description': _('inicio de sesión')},
)
def post(self, request, *args, **kwargs):
@@ -67,35 +59,25 @@ class LoginView(View, RedirectionMixin):
if login_form.is_valid():
login_user(request, login_form.get_user())
if not login_form.cleaned_data.get("remember_me"):
if not login_form.cleaned_data.get('remember_me'):
request.session.set_expiry(0)
return redirect(self.get_redirection())
return render(
request,
self.template_name,
{
"form": login_form,
"errors": login_form.errors.get("__all__"),
},
status=400,
request, self.template_name, {'form': login_form, 'errors': login_form.errors.get('__all__')}, status=400
)
class RegisterView(TemplateView, RedirectionMixin):
template_name = "users/register.html"
redirect_to = "web:login"
template_name = 'users/register.html'
redirect_to = 'web:login'
form_class = RegisterForm
def get_context_data(self, **kwargs):
settings = WebSettings.load()
return {
"form": self.form_class(),
"title": settings.web_title,
"description": _("crear cuenta"),
}
return {'form': self.form_class(), 'title': settings.web_title, 'description': _('crear cuenta')}
def post(self, request, *args, **kwargs):
settings = WebSettings.load()
@@ -107,34 +89,27 @@ class RegisterView(TemplateView, RedirectionMixin):
user = form.save()
user.username = user.email
user.first_name = form.cleaned_data.get("first_name")
user.last_name = form.cleaned_data.get("last_name")
user.first_name = form.cleaned_data.get('first_name')
user.last_name = form.cleaned_data.get('last_name')
user.save()
login(request, user)
return redirect(self.get_redirection())
else:
errors = form.errors
except IntegrityError as e:
errors = [
_("Ya existe un usuario con ese correo electrónico"),
]
except IntegrityError:
errors = [_('Ya existe un usuario con ese correo electrónico')]
return render(
request,
self.template_name,
{
"form": form,
"title": settings.web_title,
"description": _("Crear cuenta"),
"errors": errors,
},
{'form': form, 'title': settings.web_title, 'description': _('Crear cuenta'), 'errors': errors},
status=400,
)
class LogoutView(View, RedirectionMixin):
redirect_to = "web:index"
redirect_to = 'web:index'
def get(self, request, *args, **kwargs):
logout_user(request)
@@ -146,31 +121,28 @@ class LogoutView(View, RedirectionMixin):
class ResetPasswordView(TemplateView):
template_name = "users/reset_password.html"
template_name = 'users/reset_password.html'
form_class = PasswordResetForm
redirect_to = "web:reset_password_email_sent"
html_reset_password_template_name = "mails/reset_password.html"
subject_template_name = "mails/subject_reset_password.txt"
redirect_to = 'web:reset_password_email_sent'
html_reset_password_template_name = 'mails/reset_password.html'
subject_template_name = 'mails/subject_reset_password.txt'
def get_email_options(self):
return {
"extra_email_context": {},
"email_template_name": self.html_reset_password_template_name,
"html_email_template_name": self.html_reset_password_template_name,
"subject_template_name": self.subject_template_name,
'extra_email_context': {},
'email_template_name': self.html_reset_password_template_name,
'html_email_template_name': self.html_reset_password_template_name,
'subject_template_name': self.subject_template_name,
}
def get_base_context(self):
settings = WebSettings.load()
return {
"title": settings.web_title,
"description": _("Restablecer contraseña"),
}
return {'title': settings.web_title, 'description': _('Restablecer contraseña')}
def get_context_data(self, **kwargs):
context = self.get_base_context()
context.update({"form": self.form_class()})
context.update({'form': self.form_class()})
return context
def post(self, request, *args, **kwargs):
@@ -178,9 +150,9 @@ class ResetPasswordView(TemplateView):
if form.is_valid():
opts = {
"use_https": request.is_secure(),
"from_email": getattr(settings, "DEFAULT_FROM_EMAIL"),
"request": request,
'use_https': request.is_secure(),
'from_email': getattr(settings, 'DEFAULT_FROM_EMAIL'),
'request': request,
}
opts.update(self.get_email_options())
@@ -188,41 +160,32 @@ class ResetPasswordView(TemplateView):
return redirect(self.redirect_to)
context = self.get_base_context()
context.update({"form": form})
context.update({'form': form})
return render(request, self.template_name, context)
class ResetPasswordEmailSent(TemplateView):
template_name = "users/reset_password_email_sent.html"
template_name = 'users/reset_password_email_sent.html'
def get_context_data(self, **kwargs):
settings = WebSettings.load()
return {
"title": settings.web_title,
"description": settings.web_description,
}
return {'title': settings.web_title, 'description': settings.web_description}
class ResetPasswordConfirmView(TemplateView):
template_name = "users/reset_password_confirm.html"
template_name = 'users/reset_password_confirm.html'
form_class = SetPasswordForm
redirect_to = "web:login"
redirect_to = 'web:login'
token_generator = default_token_generator
def get_user(self):
try:
uidb64 = self.kwargs.get("uidb64")
uidb64 = self.kwargs.get('uidb64')
uid = urlsafe_base64_decode(uidb64).decode()
user = User.objects.get(pk=uid)
except (
TypeError,
ValueError,
OverflowError,
User.DoesNotExist,
ValidationError,
):
except (TypeError, ValueError, OverflowError, User.DoesNotExist, ValidationError):
user = None
return user
@@ -235,15 +198,15 @@ class ResetPasswordConfirmView(TemplateView):
new_token = self.generate_new_token_for_user(user)
return {
"title": WebSettings.load().web_title,
"description": _("Establecer nueva contraseña"),
"form": self.form_class(user, {"token": new_token}),
"valid_token": valid_token,
"new_token": new_token,
'title': WebSettings.load().web_title,
'description': _('Establecer nueva contraseña'),
'form': self.form_class(user, {'token': new_token}),
'valid_token': valid_token,
'new_token': new_token,
}
def check_token(self, user):
token = self.kwargs.get("token")
token = self.kwargs.get('token')
valid_token = self.token_generator.check_token(user, token)
return valid_token
@@ -258,15 +221,15 @@ class ResetPasswordConfirmView(TemplateView):
class MyAccountView(TemplateView):
template_name = "users/user_details.html"
template_name = 'users/user_details.html'
def get_context_data(self, **kwargs):
addresses = CustomerAddress.objects.filter(user=self.request.user)
web_settings = WebSettings.load()
return {
"title": f"{web_settings.web_title} - Mi cuenta",
"description": f"{web_settings.web_title} - Mi cuenta",
"customer_addresses": addresses,
'title': f'{web_settings.web_title} - Mi cuenta',
'description': f'{web_settings.web_title} - Mi cuenta',
'customer_addresses': addresses,
}