Skip to content

Commit

Permalink
Refatora métodos de views do app usuarios
Browse files Browse the repository at this point in the history
  • Loading branch information
brnocesar committed Jan 27, 2021
1 parent a3fa3d0 commit 8047bdc
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 25 deletions.
6 changes: 3 additions & 3 deletions apps/receitas/src/controller.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ def create(request):
receita.save()
messages.success(request, 'Receita cadastrada com sucesso!')

return redirect('dashboard')
return redirect('usuarios.dashboard')

return render(request, 'receitas/create.html')

Expand All @@ -61,7 +61,7 @@ def edit(request, receita_id):
receita.foto = request.FILES['foto'] if 'foto' in request.FILES else receita.foto
receita.save()

return redirect('dashboard') # redirecionar para show
return redirect('usuarios.dashboard') # redirecionar para show

return render(request, 'receitas/edit.html', {'receita': get_object_or_404(Receita, pk=receita_id)})

Expand All @@ -71,4 +71,4 @@ def destroy(request, receita_id):
receita = get_object_or_404(Receita, pk=receita_id)
receita.delete()

return redirect('dashboard')
return redirect('usuarios.dashboard')
6 changes: 3 additions & 3 deletions apps/templates/partials/_header.html
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,12 @@
<ul>
{% if user.is_authenticated %}
<li><a href="{% url 'receita.index' %}">Home</a></li>
<li><a href="{% url 'dashboard' %}">Minhas receitas</a></li>
<li><a href="{% url 'usuarios.dashboard' %}">Minhas receitas</a></li>
<li><a href="{% url 'receita.create' %}">Nova Receita</a></li>
<li><a href="{% url 'logout' %}">Logout</a></li>
<li><a href="{% url 'usuarios.logout' %}">Logout</a></li>
{% else %}
<li><a href="{% url 'cadastro' %}">Cadastro</a></li>
<li><a href="{% url 'login' %}">Login</a></li>
<li><a href="{% url 'usuarios.login' %}">Login</a></li>
{% endif %}
</ul>

Expand Down
2 changes: 1 addition & 1 deletion apps/templates/usuarios/login.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ <h2>Login</h2>
<div class="row">
<div class="col-12">
<div class="contact-form-area">
<form action="{% url 'login' %}" method="POST">
<form action="{% url 'usuarios.login' %}" method="POST">
{% csrf_token %}
<div class="row">
<div class="col-12 col-lg-12">
Expand Down
18 changes: 5 additions & 13 deletions apps/usuarios/views.py → apps/usuarios/src/controller.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
from django.contrib.auth.models import User
from django.contrib import auth, messages
from apps.receitas.models import Receita
from .validacoes import *

def cadastro(request):
def create(request):
if request.method == 'POST':
nome = request.POST['nome']
email = request.POST['email']
Expand Down Expand Up @@ -33,7 +34,7 @@ def cadastro(request):
user.save()
messages.success(request, f"Usuário {user.username} cadastrado com sucesso!")

return redirect('login')
return redirect('usuarios.login')

return render(request, 'usuarios/cadastro.html')

Expand All @@ -44,7 +45,7 @@ def login(request):

if campo_vazio(email) or campo_vazio(password):
messages.error(request, 'Todos os campos são obrigratórios!')
return redirect('login')
return redirect('usuarios.login')

if User.objects.filter(email=email).exists():
nome = User.objects.filter(email=email).values_list('username', flat=True).get()
Expand All @@ -54,7 +55,7 @@ def login(request):
auth.login(request, user)
messages.success(request, 'Login realizado com sucesso!')

return redirect('dashboard')
return redirect('usuarios.dashboard')

return render(request, 'usuarios/login.html')

Expand All @@ -70,12 +71,3 @@ def dashboard(request):
def logout(request):
auth.logout(request)
return redirect('receita.index')

def campo_vazio(campo):
return not campo.strip()

def usuario_cadastrado(username, email):
return User.objects.filter(email=email).exists() or User.objects.filter(username=username).exists()

def senhas_diferentes(password_1, password_2):
return password_1 != password_2
10 changes: 10 additions & 0 deletions apps/usuarios/src/validacoes.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
from django.contrib.auth.models import User

def campo_vazio(campo):
return not campo.strip()

def usuario_cadastrado(username, email):
return User.objects.filter(email=email).exists() or User.objects.filter(username=username).exists()

def senhas_diferentes(password_1, password_2):
return password_1 != password_2
10 changes: 5 additions & 5 deletions apps/usuarios/urls.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
from django.urls import path
from . import views
from .src.controller import *

urlpatterns = [
path('login', views.login, name='login'),
path('logout', views.logout, name='logout'),
path('cadastro', views.cadastro, name='cadastro'),
path('dashboard', views.dashboard, name='dashboard'),
path('login', login, name='usuarios.login'),
path('logout', logout, name='usuarios.logout'),
path('cadastro', create, name='cadastro'),
path('dashboard', dashboard, name='usuarios.dashboard'),
]

0 comments on commit 8047bdc

Please sign in to comment.