diff --git a/project_design/growth_app/templates/growth_app/register.html b/project_design/growth_app/templates/growth_app/register.html index 0fad5c9..f2836df 100644 --- a/project_design/growth_app/templates/growth_app/register.html +++ b/project_design/growth_app/templates/growth_app/register.html @@ -11,7 +11,7 @@

Register

{% csrf_token %} -
+
{{ form.username }}
@@ -22,7 +22,11 @@

Register

{{ form.password1 }} -
+
+
+ + {{ form.password2 }} +
+ {% comment %} {{ form }} {% endcomment %}
diff --git a/project_design/growth_app/urls.py b/project_design/growth_app/urls.py index b7b830b..3ae60e2 100644 --- a/project_design/growth_app/urls.py +++ b/project_design/growth_app/urls.py @@ -11,7 +11,7 @@ # Authentication path('signin/', views.signin_view, name='signin'), path('register/', views.register_view, name='register'), - path('logout/', auth_views.LogoutView.as_view(), name='logout'), + path('logout/', views.user_logout, name='logout'), path('forgot-password/', views.forgot_password, name='forgot_password'), # User dashboard and settings diff --git a/project_design/growth_app/views.py b/project_design/growth_app/views.py index 82020f5..f5223fa 100644 --- a/project_design/growth_app/views.py +++ b/project_design/growth_app/views.py @@ -1,10 +1,13 @@ +from re import L from django.shortcuts import render, redirect, get_object_or_404 from django.contrib.auth.decorators import login_required -from django.contrib.auth import login, authenticate +from django.contrib.auth import login, authenticate, logout from django.contrib.auth.forms import AuthenticationForm from django.http import JsonResponse from django.contrib.auth.models import User +from django.urls import reverse from .models import Business, SalesData, UserProfile + from .forms import ( RegistrationForm, BusinessForm, SalesDataForm, UserProfileForm, PasswordChangeForm @@ -41,6 +44,7 @@ def register_view(request): """User registration view.""" if request.method == 'POST': form = RegistrationForm(request.POST) + print(form.data) if form.is_valid(): user = form.save() # Create a user profile @@ -165,3 +169,8 @@ def get_sales_data(request, business_id): 'amounts': [float(item.amount) for item in sales_data] } return JsonResponse(data) + +@login_required +def user_logout(request): + logout(request) + return redirect(reverse('landing_page'))