The updates for the customer dashboard cum accounts

This commit is contained in:
Vivek
2025-12-09 03:59:57 +05:30
parent 08a89a1212
commit 24355ecdf5
38 changed files with 1057 additions and 16 deletions

View File

@@ -0,0 +1,62 @@
from django import forms
from django.contrib.auth.models import User
from django.contrib.auth.forms import UserCreationForm
from django.contrib.auth.forms import AuthenticationForm
from django.contrib.auth import get_user_model
class RegisterForm(UserCreationForm):
full_name = forms.CharField(max_length=150, required=False, label="Full name")
email = forms.EmailField(required=True, label="Email")
class Meta:
model = get_user_model()
fields = ("username", "full_name", "email", "password1", "password2")
def clean_email(self):
email = self.cleaned_data.get("email")
user = get_user_model()
if user.objects.filter(email__iexact=email).exists():
raise forms.ValidationError("A user with that email already exists.")
return email
def save(self, commit=True):
user = super().save(commit=False)
# Save full name to first_name/last_name if possible
full_name = self.cleaned_data.get("full_name", "").strip()
if full_name:
parts = full_name.split(None, 1)
user.first_name = parts[0]
if len(parts) > 1:
user.last_name = parts[1]
user.email = self.cleaned_data["email"]
user.is_active = True # create inactive until email verified
if commit:
user.save()
return user
class CustomerLoginForm(AuthenticationForm):
"""
Wrapper around Django's AuthenticationForm to customize widgets.
"""
username = forms.CharField(
label="Email or Username",
widget=forms.TextInput(attrs={
"autofocus": True,
"placeholder": "Email or username",
"class": "input",
"autocomplete": "username",
})
)
password = forms.CharField(
label="Password",
strip=False,
widget=forms.PasswordInput(attrs={
"placeholder": "Enter your password",
"class": "input",
"autocomplete": "current-password",
})
)

130
accounts/customer_views.py Normal file
View File

@@ -0,0 +1,130 @@
from django.conf import settings
from django.contrib import messages
from django.contrib.auth import login as auth_login
from django.contrib.auth.models import User
from django.contrib.sites.shortcuts import get_current_site
from django.shortcuts import render, redirect
from django.template.loader import render_to_string
from django.urls import reverse_lazy
from django.utils.http import urlsafe_base64_encode, urlsafe_base64_decode
from django.utils.encoding import force_bytes, force_str
from django.views import View
from django.views.generic import FormView
from django.contrib.auth.tokens import default_token_generator
from django.contrib.auth import authenticate, login
from django.shortcuts import render
from .customer_forms import RegisterForm, CustomerLoginForm
from django.contrib.auth import logout
from django.shortcuts import redirect
from django.contrib import messages
from django.contrib.auth.decorators import login_required
from master_data.models import EventType
from events.models import Event
from django.db.models import Prefetch
from events.models import EventImages
from django.forms.models import model_to_dict
# from utils.date_convertor import convert_date_to_dd_mm_yyyy
def send_verification_email(request, user):
"""
Renders and sends verification email with activation link.
Requires EMAIL_BACKEND configured.
"""
current_site = get_current_site(request)
subject = "Verify your email for {}".format(current_site.name)
token = default_token_generator.make_token(user)
uid = urlsafe_base64_encode(force_bytes(user.pk))
activate_path = reverse_lazy('accounts:login', kwargs={'uidb64': uid, 'token': token})
activate_url = request.build_absolute_uri(activate_path)
message = render_to_string('auth/email_verification_email.txt', {
'user': user,
'activate_url': activate_url,
'domain': current_site.domain,
})
user.email_user(subject, message)
class RegisterView(FormView):
template_name = "customer/customer_registration.html"
form_class = RegisterForm
success_url = reverse_lazy('login')
def form_valid(self, form):
user = form.save()
# send_verification_email(self.request, user)
messages.success(self.request, "Account created. Kindly login to continue.")
return super().form_valid(form)
class EmailVerificationSentView(View):
template_name = "auth/email_verification.html"
def get(self, request):
return render(request, self.template_name)
class ActivateAccountView(View):
"""
Activation link view: sets user.is_active=True if token valid.
"""
def get(self, request, uidb64, token):
try:
uid = force_str(urlsafe_base64_decode(uidb64))
user = User.objects.get(pk=uid)
except (TypeError, ValueError, OverflowError, User.DoesNotExist):
user = None
if user is not None and default_token_generator.check_token(user, token):
user.is_active = True
user.save()
messages.success(request, "Email verified — you can now sign in.")
return redirect('login')
else:
return render(request, 'auth/activation_invalid.html')
def login_view(request):
if request.method == "POST":
form = CustomerLoginForm(request, data=request.POST)
if form.is_valid():
user = form.get_user()
login(request, user)
return redirect('customer_dashboard')
else:
form = CustomerLoginForm(request)
return render(request, 'customer/customer_login.html', {'form': form})
@login_required(login_url="login")
def customer_dashboard(request):
event_types = EventType.objects.all()
events = Event.objects.all()
events_dict = [model_to_dict(obj) for obj in events]
for event in events_dict:
event['event_image'] = EventImages.objects.get(event=event['id'], is_primary=True).event_image.url
# event['start_date'] = convert_date_to_dd_mm_yyyy(event['start_date'])
print('*' * 10)
print(events_dict)
print('*' * 10)
context = {
'event_types': event_types,
'events': events_dict,
}
return render(request, "customer/customer_dashboard.html", context)
def logout_view(request):
logout(request)
messages.success(request, "You have been logged out successfully.")
return redirect("login")

View File

@@ -10,6 +10,11 @@ User = get_user_model()
class UserForm(forms.ModelForm):
full_name = forms.CharField(
max_length=150,
required=True,
label="Full Name"
)
password = forms.CharField(
widget=forms.PasswordInput,
label="Password"
@@ -39,7 +44,7 @@ class UserForm(forms.ModelForm):
class Meta:
model = User
fields = ["username", "email", "phone_number", "role", "password", "confirm_password"]
fields = ["username","full_name", "email", "phone_number", "role", "password", "confirm_password"]
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)

View File

@@ -0,0 +1,48 @@
# Generated by Django 5.0 on 2025-12-08 04:49
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('accounts', '0002_alter_user_managers_alter_user_role'),
]
operations = [
migrations.AddField(
model_name='user',
name='country',
field=models.CharField(blank=True, max_length=100, null=True),
),
migrations.AddField(
model_name='user',
name='district',
field=models.CharField(blank=True, max_length=100, null=True),
),
migrations.AddField(
model_name='user',
name='latitude',
field=models.DecimalField(blank=True, decimal_places=6, max_digits=9, null=True),
),
migrations.AddField(
model_name='user',
name='longitude',
field=models.DecimalField(blank=True, decimal_places=6, max_digits=9, null=True),
),
migrations.AddField(
model_name='user',
name='pincode',
field=models.CharField(blank=True, max_length=10, null=True),
),
migrations.AddField(
model_name='user',
name='place',
field=models.CharField(blank=True, max_length=200, null=True),
),
migrations.AddField(
model_name='user',
name='state',
field=models.CharField(blank=True, max_length=100, null=True),
),
]

View File

@@ -0,0 +1,18 @@
# Generated by Django 5.0 on 2025-12-08 20:54
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('accounts', '0003_user_country_user_district_user_latitude_and_more'),
]
operations = [
migrations.AlterField(
model_name='user',
name='role',
field=models.CharField(choices=[('Admin', 'admin'), ('Manager', 'manager'), ('Staff', 'staff')], default='Staff', max_length=20),
),
]

View File

@@ -0,0 +1,18 @@
# Generated by Django 5.0 on 2025-12-08 21:22
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('accounts', '0004_alter_user_role'),
]
operations = [
migrations.AlterField(
model_name='user',
name='role',
field=models.CharField(choices=[('admin', 'Admin'), ('manager', 'Manager'), ('staff', 'Staff')], default='Staff', max_length=20),
),
]

View File

@@ -4,9 +4,9 @@ from django.db import models
from accounts.manager import UserManager
ROLE_CHOICES = (
('Admin', 'Admin'),
('Manager', 'Manager'),
('Staff', 'Staff'),
('admin', 'Admin'),
('manager', 'Manager'),
('staff', 'Staff'),
)
@@ -18,6 +18,17 @@ class User(AbstractUser):
is_customer = models.BooleanField(default=False)
is_user = models.BooleanField(default=False)
# Location fields
pincode = models.CharField(max_length=10, blank=True, null=True)
district = models.CharField(max_length=100, blank=True, null=True)
state = models.CharField(max_length=100, blank=True, null=True)
country = models.CharField(max_length=100, blank=True, null=True)
place = models.CharField(max_length=200, blank=True, null=True)
# Location fields
latitude = models.DecimalField(max_digits=9, decimal_places=6, blank=True, null=True)
longitude = models.DecimalField(max_digits=9, decimal_places=6, blank=True, null=True)
objects = UserManager()
def __str__(self):

View File

@@ -4,6 +4,9 @@ from . import views
app_name = 'accounts'
urlpatterns = [
path('login/', views.login_view, name='login'),
path('logout/', views.logout_view, name='logout'),
path('dashboard/', views.dashboard, name='dashboard'),
path('users/', views.UserListView.as_view(), name='user_list'),
path('users/add/', views.UserCreateView.as_view(), name='user_add'),
path('users/<int:pk>/edit/', views.UserUpdateView.as_view(), name='user_edit'),

View File

@@ -53,7 +53,7 @@ class UserDeleteView(LoginRequiredMixin, generic.DeleteView):
def login_view(request):
if request.user.is_authenticated:
return redirect("dashboard") # Redirect authenticated user
return redirect("accounts:dashboard") # Redirect authenticated user
form = LoginForm(request, data=request.POST or None)
@@ -61,7 +61,10 @@ def login_view(request):
if form.is_valid():
user = form.get_user()
login(request, user)
return redirect("dashboard")
if user.role == 'admin' or user.role == 'manager' or user.role == 'staff':
return redirect("accounts:dashboard")
else:
messages.error(request, "You are not authorized to access this page.")
else:
messages.error(request, "Invalid username or password")
@@ -70,4 +73,5 @@ def login_view(request):
def logout_view(request):
logout(request)
return redirect("login")
messages.success(request, "You have been logged out successfully.")
return redirect("accounts:login")