finalizando o crud #23

gabrielgoncalo · gabrielgoncalo · commit c178e64bd784 · 2020-12-08T00:07:55.000-03:00
diff --git a/tasktracking/tasks/static/css/styles.css b/tasktracking/tasks/static/css/styles.css
@@ -20,6 +20,12 @@ a:hover {
 
 /* Barra de Navegação */
 
+.logout {
+    /*margin-right: 15px;*/
+    right: 20px;
+    
+}
+
 .navbar {
     border-bottom: 2px solid#cc71cf;
     margin-bottom: 70px;
diff --git a/tasktracking/tasks/templates/base.html b/tasktracking/tasks/templates/base.html
@@ -29,11 +29,10 @@
                     <li><a class="nav-link" href="#">Execuções</a></li>
                     <li><a class="nav-link" href="">
                     {% if user.is_authenticated %}
-                        Hi {{ user.username }}!
-                        <p><a href="{% url 'logout' %}">Log Out</a></p>
+                        Oi {{ user.username }}!
+                        <li><a class="nav-link" href="{% url 'logout' %}">Logout</a></li>
                     {% else %}
-                        <p>You are not logged in</p>
-                        <a href="{% url 'login' %}">Log In</a>
+                        <li><a class="nav-link" href="{% url 'login' %}">Login</a></li>
                     {% endif %}
                 </ul>
             </div>
diff --git a/tasktracking/tasks/templates/registration/login.html b/tasktracking/tasks/templates/registration/login.html
@@ -3,7 +3,7 @@
 <body>
 <h2>Log In</h2>
 <form method="post">
-  <input type="hidden" name="csrfmiddlewaretoken" value="oknvdDtxFgQqC1JNAiGL5kyxOuDIU1JKrdHto4Ih39hOzW48kh1O5gjJsf3smaZx">
+  {% csrf_token %}
   <ul class="errorlist nonfield">
 <li>Por favor, entre com um usuário  e senha corretos. Note que ambos os campos diferenciam maiúsculas e minúsculas.
 </li>
@@ -17,6 +17,8 @@ <h2>Log In</h2>
 <input type="password" name="password" autocomplete="current-password" required="" id="id_password">
 </p>
   <button type="submit">Log In</button>
+  
 </form>
+<a href="{% url 'signup' %}">cadastre-se.</a>
 </body>
 </html>
diff --git a/tasktracking/tasks/templates/registration/signup.html b/tasktracking/tasks/templates/registration/signup.html
@@ -1,5 +1,3 @@
-{% extends 'base.html' %}
-
 {% block title %}Sign Up{% endblock %}
 
 {% block content %}
diff --git a/tasktracking/tasks/urls.py b/tasktracking/tasks/urls.py
@@ -6,7 +6,7 @@
 from django.views.generic.base import TemplateView
 
 
-#from .views import SignUpView
+from .views import SignUpView
 
 urlpatterns = [
     path('', views.index, name='index'),
@@ -18,6 +18,6 @@
     path('cadastrar_execucao', views.cadastrar_execucao, name='cadastrar_execucao'),
     path('accounts/', include('django.contrib.auth.urls')), # new
     #path('accounts/', include('accounts.urls')), # new
-    #path('signup/', SignUpView.as_view(), name='signup'),
+    path('signup/', SignUpView.as_view(), name='signup'),
     #path('', TemplateView.as_view(template_name='home.html'), name='home'), # new
 ]
diff --git a/tasktracking/tasks/views.py b/tasktracking/tasks/views.py
@@ -5,9 +5,9 @@
 from datetime import datetime
 from tasks.forms import LinkForm, TarefaForm, TagForm
 from django.core.paginator import Paginator
-#from django.contrib.auth.forms import UserCreationForm
-#from django.urls import reverse_lazy
-#from django.views import generic
+from django.contrib.auth.forms import UserCreationForm
+from django.urls import reverse_lazy
+from django.views import generic
 
 from tasks.models import Execucao, Tarefa
 from tasks.models import Link
@@ -116,7 +116,7 @@ def stop_execucao(request):
     data = dict()
     return JsonResponse(data)
 
-#class SignUpView(generic.CreateView):
-   # form_class = UserCreationForm
-   # success_url = reverse_lazy('login')
-   # template_name = 'registration/signup.html'
+class SignUpView(generic.CreateView):
+    form_class = UserCreationForm
+    success_url = reverse_lazy('login')
+    template_name = 'registration/signup.html'
diff --git a/tasktracking/tasktracking/settings.py b/tasktracking/tasktracking/settings.py
@@ -28,6 +28,7 @@
 ALLOWED_HOSTS = []
 
 LOGIN_REDIRECT_URL = '/'
+LOGOUT_REDIRECT_URL = '/' # new
 # Application definition
 
 INSTALLED_APPS = [

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-{% extends 'base.html' %}`
`2`		`-`
`3`	`1`	`{% block title %}Sign Up{% endblock %}`
`4`	`2`
`5`	`3`	`{% block content %}`