Add notification app with initial models, views, and admin configuration; remove unused image files

api/admin.py

@@ -1,36 +1,81 @@
 from django.contrib import admin
-from .models import Bhagat, Event, Attendance,  Notification, Region, BhajanCategory, Bhajan
+from .models import (
+    Bhagat,
+    Event,
+    Attendance,
+    Notification,
+    Region,
+    BhajanCategory,
+    Bhajan,
+    PushSubscription,
+    OptionPoll,
+    Poll,
+)
 from import_export.admin import ImportExportModelAdmin
 
+
 # Register your models here.
 class BhagatAdmin(ImportExportModelAdmin):
-    list_display = ('__str__', 'email', 'region', 'user_type', 'assigned_to')
-    list_filter = ('region', 'user_type')
-    search_fields = ('__str__', 'email', 'region', 'user_type', 'assigned_to')
+    list_display = (
+        "get_full_name",
+        "profileImage",
+        "email",
+        "region",
+        "user_type",
+        "assigned_to",
+    )
+    list_filter = ("region", "user_type")
+    search_fields = (
+        "get_full_name",
+        "email",
+        "region",
+        "user_type",
+        "assigned_to",
+    )
+
 
 class RegionAdmin(ImportExportModelAdmin):
-    list_display = ('name',)
+    list_display = ("name",)
+
 
 class BhajanCategoryAdmin(ImportExportModelAdmin):
-    list_display = ('name', 'link')
-    search_fields = ('name',)
-    
+    list_display = ("name", "icon_image", "link")
+    search_fields = ("name",)
+
+
 class BhajanAdmin(ImportExportModelAdmin):
-    list_display = ('title', 'title_guj', 'category', 'lyricsBtn')
-    search_fields = ('title', 'title_guj', 'category__name')
-    list_filter = ('category',)
+    list_display = ("title", "title_guj", "category", "lyricsBtn")
+    search_fields = ("title", "title_guj", "category__name")
+    list_filter = ("category",)
     #  'musicPreivew',
 
+
 class EventAdmin(ImportExportModelAdmin):
-    list_display = ('title', 'date', 'region', 'is_approved', 'color')
-    list_filter = ('region', 'is_approved', 'color')
-    search_fields = ('title', 'date', 'region', 'is_approved', 'color')
-    list_editable = ('is_approved', 'color')
+    list_display = ("title", "date", "region", "is_approved", "color")
+    list_filter = ("region", "is_approved", "color")
+    search_fields = ("title", "date", "region", "is_approved", "color")
+    list_editable = ("is_approved", "color")
+
 
 class NotificationAdmin(ImportExportModelAdmin):
-    list_display = ('sender', 'title','timestamp', 'notification_type')
-    list_filter = ('notification_type',)
-    search_fields = ('sender__first_name', 'title', 'notification_type')
+    list_display = ("sender", "title", "timestamp", "notification_type")
+    list_filter = ("notification_type",)
+    search_fields = ("sender__first_name", "title", "notification_type")
+
+
+class PushSubscriptionAdmin(ImportExportModelAdmin):
+    list_display = ("user", "endpoint")
+
+
+class OptionPollAdmin(ImportExportModelAdmin):
+    list_display = ("optionText",)
+    search_fields = ("optionText",)
+
+
+class PollAdmin(ImportExportModelAdmin):
+    list_display = ("question", "created_by", "created_at")
+    search_fields = ("question", "created_by")
+
 
 admin.site.register(Bhagat, BhagatAdmin)
 admin.site.register(Region, RegionAdmin)
@@ -38,3 +83,6 @@ admin.site.register(BhajanCategory, BhajanCategoryAdmin)
 admin.site.register(Bhajan, BhajanAdmin)
 admin.site.register(Event, EventAdmin)
 admin.site.register(Notification, NotificationAdmin)
+admin.site.register(PushSubscription, PushSubscriptionAdmin)
+admin.site.register(OptionPoll, OptionPollAdmin)
+admin.site.register(Poll, PollAdmin)

api/migrations/0016_pushsubscription.py

@@ -0,0 +1,26 @@
+# Generated by Django 5.1.6 on 2025-02-13 21:48
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0015_alter_bhagat_phone'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='PushSubscription',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('endpoint', models.URLField(max_length=500)),
+                ('p256dh', models.CharField(max_length=200)),
+                ('auth', models.CharField(max_length=100)),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+    ]

api/migrations/0017_optionpoll_poll.py

@@ -0,0 +1,34 @@
+# Generated by Django 5.1.6 on 2025-02-14 17:09
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0016_pushsubscription'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='OptionPoll',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('optionText', models.TextField()),
+                ('voters', models.ManyToManyField(blank=True, related_name='options_voters', to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Poll',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('question', models.TextField()),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('created_by', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='polls_creator', to=settings.AUTH_USER_MODEL)),
+                ('options', models.ManyToManyField(blank=True, related_name='polls_options', to='api.optionpoll')),
+                ('participant', models.ManyToManyField(blank=True, related_name='polls_participant', to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+    ]

api/migrations/0018_rename_participant_poll_participants.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.6 on 2025-02-14 17:33
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0017_optionpoll_poll'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='poll',
+            old_name='participant',
+            new_name='participants',
+        ),
+    ]

api/migrations/0019_bhajancategory_icon.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.6 on 2025-02-15 18:50
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0018_rename_participant_poll_participants'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='bhajancategory',
+            name='icon',
+            field=models.URLField(blank=True),
+        ),
+    ]

api/migrations/0020_alter_bhajan_audio_url.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.6 on 2025-02-15 22:46
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0019_bhajancategory_icon'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='bhajan',
+            name='audio_url',
+            field=models.CharField(blank=True, max_length=500),
+        ),
+    ]

api/models.py

@@ -28,14 +28,21 @@ class Bhagat(AbstractUser):
     pincode = models.CharField(max_length=10, null=True)
     assigned_to = models.ForeignKey('self', on_delete=models.SET_NULL, null=True, blank=True, related_name='assigned_users')
     profile_image = models.URLField(blank=True)
-    
+
     def __str__(self):
         return self.first_name + ' ' + self.last_name
 
     def save(self, *args, **kwargs):
-        self.set_password(self.password)
+        if not self.password.startswith("pbkdf2_sha256"):
+            self.set_password(self.password)
         super().save(*args, **kwargs)
 
+    def profileImage(self):
+        return mark_safe('<img src="%s" width="50" height="50" />' % self.profile_image)
+
+    def get_full_name(self):
+        return super().get_full_name()
+
 
 class Region(models.Model):
     name = models.CharField(max_length=100)
@@ -75,31 +82,36 @@ class Notification(models.Model):
 class BhajanCategory(models.Model):
     name = models.CharField(max_length=100)
     link = models.CharField(max_length=100)
-    
+    icon = models.URLField(blank=True)
+
     def __str__(self):
         return self.name
 
+    def icon_image(self):
+        return mark_safe('<img src="%s" width="50" height="50" />' % self.icon)
+
+
 class Bhajan(models.Model):
-    bhajanId = models.IntegerField(blank=True,default=0)
-    title = models.CharField(max_length=500,blank=True)
-    title_guj = models.CharField(max_length=500,blank=True)
+    bhajanId = models.IntegerField(blank=True, default=0)
+    title = models.CharField(max_length=500, blank=True)
+    title_guj = models.CharField(max_length=500, blank=True)
     category = models.ForeignKey(BhajanCategory, on_delete=models.CASCADE)
     lyrics = models.CharField(max_length=50, blank=True)
-    audio_url = models.URLField(blank=True)
+    audio_url = models.CharField(max_length=500, blank=True)
     isEng = models.BooleanField(default=False)
     isHnd = models.BooleanField(default=False)
     isGer = models.BooleanField(default=False)
     isAudio = models.BooleanField(default=False)
-    
+
     def __str__(self):
         return self.title
-    
+
     def musicPreivew(self):
         if self.isAudio:
             return mark_safe('<audio controls><source src="https://huggingface.co/spaces/thejagstudio/MusicStore/resolve/main/Bhajan Audio/%s" type="audio/mpeg"></audio>' % self.audio_url)
         else:
             return 'No Audio Available'
-    
+
     def lyricsBtn(self):
         # i have four languages in my bhajan so add them all as buttons and show them on click
         languages = [["","GUJ"]]
@@ -113,4 +125,37 @@ class Bhajan(models.Model):
         for lang in languages:
             html += '<li style="padding-bottom:12px"><a href="https://huggingface.co/spaces/thejagstudio/MusicStore/raw/main/HTML Files/'+lang[0] + self.lyrics+'" target="_blank" class="import_link">'+(lang[1])+'</a></li>'
         html += '</ul>'
-        return mark_safe(html)
+        return mark_safe(html)
+
+
+class PushSubscription(models.Model):
+    user = models.ForeignKey(Bhagat, on_delete=models.CASCADE, null=True)
+    endpoint = models.URLField(max_length=500)
+    p256dh = models.CharField(max_length=200)
+    auth = models.CharField(max_length=100)
+    created_at = models.DateTimeField(auto_now_add=True)
+
+
+class OptionPoll(models.Model):
+    optionText = models.TextField()
+    voters = models.ManyToManyField(Bhagat, related_name="options_voters", blank=True)
+
+    def __str__(self):
+        return self.optionText
+
+
+class Poll(models.Model):
+    question = models.TextField()
+    options = models.ManyToManyField(
+        OptionPoll, related_name="polls_options", blank=True
+    )
+    participants = models.ManyToManyField(
+        Bhagat, related_name="polls_participant", blank=True
+    )
+    created_by = models.ForeignKey(
+        Bhagat, on_delete=models.CASCADE, related_name="polls_creator"
+    )
+    created_at = models.DateTimeField(auto_now_add=True)
+
+    def __str__(self):
+        return self.question

api/urls.py

@@ -3,19 +3,25 @@ from . import views
 from rest_framework_simplejwt.views import TokenRefreshView
 
 urlpatterns = [
-    path('login/', views.login, name='login'),
-    path('logout/', views.logout, name='logout'),
-    path('get-user-profile/', views.get_user_profile, name='get_user_profile'),
-    path('profile-updater/', views.profile_updater, name='profile_updater'),
-    path('token/refresh/', TokenRefreshView.as_view(), name='token_refresh'),
-    
-    path('dataEntry/', views.dataEntry, name='dataEntry'),
-    path('send-notification/', views.send_notification, name='send_notification'),
-    
-    path('bhajan-category-list/', views.bhajanCategoryList, name='bhajanCategoryList'),
-    path('bhajan-detail/<int:id>', views.bhajanDetail, name='bhajanDetail'),
-    path('event-list/', views.eventList, name='eventList'),
-    path('notification/', views.notification, name='notification'),
-    
-    path('bhakto-list/', views.bhaktoList, name='bhaktoList'),
+    path("login/", views.login, name="login"),
+    path("logout/", views.logout, name="logout"),
+    path("get-user-profile/", views.get_user_profile, name="get_user_profile"),
+    path("profile-updater/", views.profile_updater, name="profile_updater"),
+    path("token/refresh/", TokenRefreshView.as_view(), name="token_refresh"),
+    path("dataEntry/", views.dataEntry, name="dataEntry"),
+    path("send-notification/", views.send_notification, name="send_notification"),
+    path("bhajan-list/<str:catLink>", views.bhajanList, name="bhajanList"),
+    path("bhajan-category-list/", views.bhajanCategoryList, name="bhajanCategoryList"),
+    path(
+        "bhajan-detail/<str:catLink>/<int:id>", views.bhajanDetail, name="bhajanDetail"
+    ),
+    path("event-list/", views.eventList, name="eventList"),
+    path("bhakto-list/", views.bhaktoList, name="bhaktoList"),
+    path("notification/", views.notification, name="notification"),
+    path("push-subscription/", views.save_push_subscription, name="push_subscription"),
+    path("send-otp/", views.send_otp, name="send_otp"),
+    path("verify-otp/", views.verify_otp, name="verify_otp"),
+    path("change-password/", views.change_password, name="change_password"),
+    path("polls/", views.polls, name="polls"),
+    path("poll-voters/<int:id>", views.voterList, name="voterList"),
 ]

api/views.py

@@ -5,8 +5,20 @@ from django.http import JsonResponse, HttpResponse
 from django.views.decorators.http import require_POST
 from django.utils import timezone
 import json
-from .models import Bhagat, Event, Attendance,  Notification, Region, BhajanCategory, Bhajan
+from .models import (
+    Bhagat,
+    Event,
+    Attendance,
+    PushSubscription,
+    Notification,
+    Region,
+    BhajanCategory,
+    Bhajan,
+    OptionPoll,
+    Poll,
+)
 from django.conf import settings
+from django.core import serializers
 import requests
 
 from rest_framework.decorators import api_view, permission_classes
@@ -14,6 +26,7 @@ from rest_framework.permissions import AllowAny
 from rest_framework.response import Response
 from .utils import jwt_required
 from rest_framework_simplejwt.tokens import RefreshToken
+from pywebpush import webpush, WebPushException
 
 
 def gCaptchaVerifer(token):
@@ -24,15 +37,15 @@ def gCaptchaVerifer(token):
 
 
 def is_superadmin(user):
-    return user.user_type == 'superadmin'
+    return user.user_type == "superadmin"
 
 
 def is_regionadmin(user):
-    return user.user_type == 'regionadmin'
+    return user.user_type == "regionadmin"
 
 
 def is_monitor(user):
-    return user.user_type == 'monitor'
+    return user.user_type == "monitor"
 
 
 def dataEntry(request):
@@ -57,52 +70,78 @@ def dataEntry(request):
 
 def bhajanCategoryList(request):
     categories = BhajanCategory.objects.all()
-    bhajans = Bhajan.objects.all()
-    bhajanArr = []
-    for bhajan in bhajans:
-        bhajanArr.append({
-            "id": bhajan.bhajanId,
-            "title": bhajan.title,
-            "title_guj": bhajan.title_guj,
-            "category": bhajan.category.name,
-            "lyrics": bhajan.lyrics,
-            "audio_url": bhajan.audio_url,
-            "isEng": bhajan.isEng,
-            "isHnd": bhajan.isHnd,
-            "isGer": bhajan.isGer,
-            "isAudio": bhajan.isAudio
-        })
     categoryArr = []
     for category in categories:
-        categoryArr.append({
-            "name": category.name,
-            "link": category.link
-        })
-    lyricsBase = "https://huggingface.co/spaces/thejagstudio/MusicStore/raw/main/HTML Files/"
+        categoryArr.append(
+            {"name": category.name, "link": category.link, "icon": category.icon}
+        )
+    lyricsBase = (
+        "https://huggingface.co/spaces/thejagstudio/MusicStore/raw/main/HTML Files/"
+    )
+    audioBase = "https://huggingface.co/spaces/thejagstudio/MusicStore/resolve/main/Bhajan Audio/"
+    return JsonResponse(
+        {"categories": categoryArr, "lyricsBase": lyricsBase, "audioBase": audioBase}
+    )
+
+
+def bhajanList(request, catLink):
+    if catLink == "all-kirtan":
+        bhajans = Bhajan.objects.all()
+        category = "All Kirtan"
+    else:
+        bhajans = Bhajan.objects.filter(category__link=catLink)
+        category = BhajanCategory.objects.get(link=catLink).name
+    bhajanArr = []
+    for bhajan in bhajans:
+        bhajanArr.append(
+            {
+                "id": bhajan.bhajanId,
+                "title": bhajan.title,
+                "title_guj": bhajan.title_guj,
+                "lyrics": bhajan.lyrics,
+                "audio_url": bhajan.audio_url,
+                "isEng": bhajan.isEng,
+                "isHnd": bhajan.isHnd,
+                "isGer": bhajan.isGer,
+                "isAudio": bhajan.isAudio,
+            }
+        )
+
+    lyricsBase = (
+        "https://huggingface.co/spaces/thejagstudio/MusicStore/raw/main/HTML Files/"
+    )
     audioBase = "https://huggingface.co/spaces/thejagstudio/MusicStore/resolve/main/Bhajan Audio/"
-    return JsonResponse({"categories": categoryArr, "bhajans": bhajanArr, "lyricsBase": lyricsBase, "audioBase": audioBase})
+    return JsonResponse(
+        {
+            "bhajans": bhajanArr,
+            "lyricsBase": lyricsBase,
+            "audioBase": audioBase,
+            "category": category,
+        }
+    )
 
 
-def bhajanDetail(request, id):
-    bhajan = Bhajan.objects.get(bhajanId=id)
+def bhajanDetail(request, catLink, id):
+    bhajan = Bhajan.objects.get(bhajanId=id, category__link=catLink)
     if bhajan is None:
         return JsonResponse({"error": "Bhajan not found"})
     else:
-        return JsonResponse({
-            "id": bhajan.bhajanId,
-            "title": bhajan.title,
-            "title_guj": bhajan.title_guj,
-            "category": bhajan.category.name,
-            "lyrics": bhajan.lyrics,
-            "audio_url": bhajan.audio_url,
-            "isEng": bhajan.isEng,
-            "isHnd": bhajan.isHnd,
-            "isGer": bhajan.isGer,
-            "isAudio": bhajan.isAudio,
-            "lyricsBase": "https://huggingface.co/spaces/thejagstudio/MusicStore/raw/main/HTML Files/",
-            "audioBase": "https://huggingface.co/spaces/thejagstudio/MusicStore/resolve/main/Bhajan Audio/"
-        })
-    return HttpResponse("Bhajan Detail Page")
+        return JsonResponse(
+            {
+                "id": bhajan.bhajanId,
+                "title": bhajan.title,
+                "title_guj": bhajan.title_guj,
+                "category": bhajan.category.name,
+                "lyrics": bhajan.lyrics,
+                "audio_url": bhajan.audio_url,
+                "isEng": bhajan.isEng,
+                "isHnd": bhajan.isHnd,
+                "isGer": bhajan.isGer,
+                "isAudio": bhajan.isAudio,
+                "lyricsBase": "https://huggingface.co/spaces/thejagstudio/MusicStore/raw/main/HTML Files/",
+                "audioBase": "https://huggingface.co/spaces/thejagstudio/MusicStore/resolve/main/Bhajan Audio/",
+            }
+        )
 
 
 def eventList(request):
@@ -110,34 +149,45 @@ def eventList(request):
     eventArr = []
     for event in events:
         # convert date to Sept 26,2024 | 8:30 - 9:30
-        dateFormatted = event.date.strftime("%b %d, %Y") + " | " + event.date.strftime("%I:%M %p") + " - " + event.time.strftime("%I:%M %p")
-        eventArr.append({
-            "title": event.title,
-            "description": event.description,
-            "date": dateFormatted,
-            "day": int(event.date.strftime("%d")),
-            "month": int(event.date.strftime("%m")),
-            "year": int(event.date.strftime("%Y")),
-            "created_by": event.created_by.__str__(),
-            "region": event.region.name,
-            "is_approved": event.is_approved,
-            "color": event.color
-        })
+        dateFormatted = (
+            event.date.strftime("%b %d, %Y")
+            + " | "
+            + event.date.strftime("%I:%M %p")
+            + " - "
+            + event.time.strftime("%I:%M %p")
+        )
+        eventArr.append(
+            {
+                "title": event.title,
+                "description": event.description,
+                "date": dateFormatted,
+                "day": int(event.date.strftime("%d")),
+                "month": int(event.date.strftime("%m")),
+                "year": int(event.date.strftime("%Y")),
+                "created_by": event.created_by.__str__(),
+                "region": event.region.name,
+                "is_approved": event.is_approved,
+                "color": event.color,
+            }
+        )
     return JsonResponse({"events": eventArr})
 
+
 @jwt_required()
 def notification(request):
     notifications = Notification.objects.all()
     notificationArr = []
     for notification in notifications:
-        notificationArr.append({
-            "sender": notification.sender.__str__(),
-            "category": notification.sender.user_type,
-            "title": notification.title,
-            "content": notification.content,
-            "timestamp": notification.timestamp.strftime("%b %d, %Y | %I:%M %p"),
-            "notification_type": notification.notification_type
-        })
+        notificationArr.append(
+            {
+                "sender": notification.sender.__str__(),
+                "category": notification.sender.user_type,
+                "title": notification.title,
+                "content": notification.content,
+                "timestamp": notification.timestamp.strftime("%b %d, %Y | %I:%M %p"),
+                "notification_type": notification.notification_type,
+            }
+        )
     return JsonResponse({"notifications": notificationArr})
 
 
@@ -145,48 +195,55 @@ def notification(request):
 @csrf_exempt
 @jwt_required()
 def send_notification(request):
-    if request.method == 'POST':
-        content = request.POST.get('content')
-        recipient_type = request.POST.get('recipient_type')
-        if recipient_type == 'all':
-            recipients = Bhagat.objects.all()
-        elif recipient_type == 'monitors':
-            recipients = Bhagat.objects.filter(user_type='monitor')
-        elif recipient_type == 'regionadmins':
-            recipients = Bhagat.objects.filter(user_type='regionadmin')
+    if request.method == "POST":
+        content = request.POST.get("content")
+        recipient_type = request.POST.get("recipient_type")
 
-        notification = Notification.objects.create(sender=request.user, content=content, notification_type='custom')
-        notification.recipients.set(recipients)
+        notification = Notification.objects.create(
+            sender=request.user, content=content, notification_type="custom"
+        )
+
+        # Send web push notifications
+        subscriptions = PushSubscription.objects.all()
+        for subscription in subscriptions:
+            send_push_notification(
+                subscription,
+                {
+                    "title": "New Notification",
+                    "content": content,
+                    "url": "/notifications",
+                },
+            )
 
-    return redirect('notifications')
+        return JsonResponse({"status": "success"})
+    return JsonResponse({"status": "error"})
 
 
 def birthday_notifications():
     today = timezone.now().date()
-    birthday_users = Bhagat.objects.filter(birthday__month=today.month, birthday__day=today.day)
+    birthday_users = Bhagat.objects.filter(
+        birthday__month=today.month, birthday__day=today.day
+    )
     for user in birthday_users:
         notification = Notification.objects.create(
-            sender=Bhagat.objects.get(user_type='superadmin'),
+            sender=Bhagat.objects.get(user_type="superadmin"),
             content=f"Happy Birthday to {user.get_full_name()}!",
-            notification_type='birthday'
+            notification_type="birthday",
         )
         notification.recipients.set(Bhagat.objects.all())
 
 
 @csrf_exempt
 def login(request):
-    if request.method == 'POST':
-        username = request.POST.get('username')
-        password = request.POST.get('password')
-        captcha_response = request.POST.get('captcha_response')
+    if request.method == "POST":
+        username = request.POST.get("username")
+        password = request.POST.get("password")
+        captcha_response = request.POST.get("captcha_response")
 
         # Verify captcha
         result = gCaptchaVerifer(captcha_response)
         if not result.get("success"):
-            return JsonResponse({
-                "error": "Invalid Captcha",
-                "status": "error"
-            })
+            return JsonResponse({"error": "Invalid Captcha", "status": "error"})
 
         # Authenticate user
         user = Bhagat.objects.filter(username=username).first()
@@ -194,145 +251,131 @@ def login(request):
             # Generate tokens
             refresh = RefreshToken.for_user(user)
 
-            return JsonResponse({
-                "status": "success",
-                "tokens": {
-                    "access_token": str(refresh.access_token),
-                    "refresh_token": str(refresh)
-                },
-                "user": {
-                    "id": user.id,
-                    "username": user.username,
-                    "first_name": user.first_name,
-                    "last_name": user.last_name,
-                    "email": user.email,
-                    "phone": user.phone,
-                    "region": user.region.name,
-                    "user_type": user.user_type,
-                    "profile_image": user.profile_image
+            return JsonResponse(
+                {
+                    "status": "success",
+                    "tokens": {
+                        "access_token": str(refresh.access_token),
+                        "refresh_token": str(refresh),
+                    },
+                    "user": {
+                        "id": user.id,
+                        "username": user.username,
+                        "first_name": user.first_name,
+                        "last_name": user.last_name,
+                        "email": user.email,
+                        "phone": user.phone,
+                        "region": user.region.name,
+                        "user_type": user.user_type,
+                        "profile_image": user.profile_image,
+                    },
                 }
-            })
-
-        return JsonResponse({
-            "error": "Invalid credentials",
-            "status": "error"
-        })
+            )
 
-    return JsonResponse({
-        "error": "Invalid Method",
-        "status": "error"
-    })
+        return JsonResponse({"error": "Invalid credentials", "status": "error"})
 
+    return JsonResponse({"error": "Invalid Method", "status": "error"})
 
 
 @csrf_exempt
 @jwt_required()
 def logout(request):
-    if request.method == 'POST':
-        refresh_token = request.POST.get('refresh_token')
+    if request.method == "POST":
+        refresh_token = request.POST.get("refresh_token")
         if not refresh_token:
-            return JsonResponse({
-                'error': 'Refresh token is required',
-                'status': 'error'
-            })
+            return JsonResponse(
+                {"error": "Refresh token is required", "status": "error"}
+            )
         else:
             try:
                 refresh = RefreshToken(refresh_token)
                 refresh.blacklist()
-                return JsonResponse({
-                    'status': 'success',
-                    'message': 'Successfully logged out'
-                })
-            except TokenError:
-                return JsonResponse({
-                    "error": "Invalid token",
-                    "status": "error"
-                })
-    return JsonResponse({
-        "status": "error",
-        "error": "Invalid Method"
-    })
+                return JsonResponse(
+                    {"status": "success", "message": "Successfully logged out"}
+                )
+            except Exception as e:
+                return JsonResponse(
+                    {"error": "Invalid token | " + str(e), "status": "error"}
+                )
+    return JsonResponse({"status": "error", "error": "Invalid Method"})
 
 
 @jwt_required()
 def get_user_profile(request):
     try:
         user = request.user
-        return JsonResponse({
-            "status": "success",
-            "user": {
-                "id": user.id,
-                "username": user.username,
-                "first_name": user.first_name,
-                "last_name": user.last_name,
-                "email": user.email,
-                "phone": user.phone,
-                "region": user.region.name,
-                "user_type": user.user_type,
-                "profile_image": user.profile_image
+        return JsonResponse(
+            {
+                "status": "success",
+                "user": {
+                    "id": user.id,
+                    "username": user.username,
+                    "first_name": user.first_name,
+                    "last_name": user.last_name,
+                    "email": user.email,
+                    "phone": user.phone,
+                    "region": user.region.name,
+                    "user_type": user.user_type,
+                    "profile_image": user.profile_image,
+                },
             }
-        })
+        )
     except Exception as e:
-        return JsonResponse({
-            "status": "error",
-            "error": str(e)
-        })
+        return JsonResponse({"status": "error", "error": str(e)})
+
 
 @csrf_exempt
 @jwt_required()
 def profile_updater(request):
-    if request.method == 'POST':
+    if request.method == "POST":
         try:
             user = request.user
-            first_name = request.POST.get('first_name')
+            first_name = request.POST.get("first_name")
             if first_name:
                 user.first_name = first_name
-            last_name = request.POST.get('last_name')
+            last_name = request.POST.get("last_name")
             if last_name:
                 user.last_name = last_name
-            email = request.POST.get('email')
+            email = request.POST.get("email")
             if email:
                 user.email = email
-            phone = request.POST.get('phone')
+            phone = request.POST.get("phone")
             if phone:
                 user.phone = phone
-            region_name = request.POST.get('region')
+            region_name = request.POST.get("region")
             if region_name:
                 user.region = Region.objects.get(name=region_name)
-            birth_date = request.POST.get('birth_date')
+            birth_date = request.POST.get("birth_date")
             if birth_date:
                 user.birthday = birth_date
-            street_name = request.POST.get('street_name')
+            street_name = request.POST.get("street_name")
             if street_name:
                 user.streetName = street_name
-            pincode = request.POST.get('pincode')
+            pincode = request.POST.get("pincode")
             if pincode:
                 user.pincode = pincode
-            city = request.POST.get('city')
+            city = request.POST.get("city")
             if city:
                 user.city = city
-            state = request.POST.get('state')
+            state = request.POST.get("state")
             if state:
                 user.state = state
-            country = request.POST.get('country')
+            country = request.POST.get("country")
             if country:
                 user.country = country
-            profile_image = request.POST.get('profile_image')
+            profile_image = request.POST.get("profile_image")
             if profile_image:
                 user.profile_image = profile_image
             user.save()
-            return JsonResponse({
-                "status": "success",
-                "message": "Profile updated successfully"
-            })
+            return JsonResponse(
+                {"status": "success", "message": "Profile updated successfully"}
+            )
         except Exception as e:
-            return JsonResponse({
-                "status": "error",
-                "error": str(e)
-            })
+            return JsonResponse({"status": "error", "error": str(e)})
     else:
         user = request.user
-        data= {
+        regions = Region.objects.all()
+        data = {
             "first_name": user.first_name,
             "last_name": user.last_name,
             "email": user.email,
@@ -344,12 +387,15 @@ def profile_updater(request):
             "city": user.city,
             "state": user.state,
             "country": user.country,
-            "profile_image": user.profile_image
+            "profile_image": user.profile_image,
         }
-        return JsonResponse({
-            "status": "success",
-            "user": data
-        })
+        return JsonResponse(
+            {
+                "status": "success",
+                "regions": [region.name for region in regions],
+                "user": data,
+            }
+        )
 
 
 @jwt_required()
@@ -358,12 +404,229 @@ def bhaktoList(request):
     bhaktos = Bhagat.objects.filter(assigned_to=current_user).all()
     bhaktoArr = []
     for bhakto in bhaktos:
-        bhaktoArr.append({
-            "id": bhakto.id,
-            "first_name": bhakto.first_name,
-            "last_name": bhakto.last_name,
-            "region": bhakto.region.name,
-            "user_type": bhakto.user_type,
-            "profile_image": bhakto.profile_image
-        })
-    return JsonResponse({"bhaktos": bhaktoArr})
+        bhaktoArr.append(
+            {
+                "id": bhakto.id,
+                "first_name": bhakto.first_name,
+                "last_name": bhakto.last_name,
+                "region": bhakto.region.name,
+                "user_type": bhakto.user_type,
+                "profile_image": bhakto.profile_image,
+            }
+        )
+    return JsonResponse({"bhaktos": bhaktoArr})
+
+
+@api_view(["POST"])
+@permission_classes([AllowAny])
+def send_otp(request):
+    try:
+        data = json.loads(request.body)
+        phone = data.get("phone")
+
+        if not phone:
+            return JsonResponse(
+                {"status": "error", "error": "Phone number is required"}
+            )
+
+        # Check if user exists
+        user = Bhagat.objects.filter(phone=phone).first()
+        if not user:
+            return JsonResponse(
+                {"status": "error", "error": "No account found with this phone number"}
+            )
+
+        # Generate dummy OTP (in production, use proper OTP generation and SMS service)
+        otp = "123456"  # Dummy OTP for testing
+        print(f"Generated OTP for {phone}: {otp}")  # This simulates sending OTP
+
+        # In production, store OTP with timestamp in database or cache
+        # For now, we'll just return success
+        return JsonResponse({"status": "success", "message": "OTP sent successfully"})
+
+    except Exception as e:
+        return JsonResponse({"status": "error", "error": str(e)})
+
+
+@api_view(["POST"])
+@permission_classes([AllowAny])
+def verify_otp(request):
+    try:
+        data = json.loads(request.body)
+        phone = data.get("phone")
+        otp = data.get("otp")
+
+        if not phone or not otp:
+            return JsonResponse(
+                {"status": "error", "error": "Phone number and OTP are required"}
+            )
+
+        # For demo purposes, accept any 6-digit OTP
+        if otp == "123456":  # Dummy verification
+            return JsonResponse(
+                {"status": "success", "message": "OTP verified successfully"}
+            )
+
+        return JsonResponse({"status": "error", "error": "Invalid OTP"})
+
+    except Exception as e:
+        return JsonResponse({"status": "error", "error": str(e)})
+
+
+@api_view(["POST"])
+@jwt_required()
+@csrf_exempt
+@permission_classes([AllowAny])
+def change_password(request):
+    try:
+        data = json.loads(request.body)
+        new_password = data.get("new_password")
+
+        if not new_password:
+            return JsonResponse(
+                {
+                    "status": "error",
+                    "error": "Phone number and new password are required",
+                }
+            )
+
+        # Update user's password
+        user = request.user
+        if not user:
+            return JsonResponse({"status": "error", "error": "User not found"})
+
+        user.password = new_password
+        user.save()
+
+        return JsonResponse(
+            {"status": "success", "message": "Password changed successfully"}
+        )
+
+    except Exception as e:
+        return JsonResponse({"status": "error", "error": str(e)})
+
+
+@jwt_required()
+@api_view(["POST"])
+@csrf_exempt
+@permission_classes([AllowAny])
+def save_push_subscription(request):
+    try:
+        subscription_data = json.loads(request.body)
+        user = request.user
+        pushUser = PushSubscription.objects.filter(user=user).first()
+        if pushUser:
+            pushUser.endpoint = subscription_data["endpoint"]
+            pushUser.p256dh = subscription_data["keys"]["p256dh"]
+            pushUser.auth = subscription_data["keys"]["auth"]
+            pushUser.save()
+        else:
+            PushSubscription.objects.create(
+                user=user,
+                endpoint=subscription_data["endpoint"],
+                p256dh=subscription_data["keys"]["p256dh"],
+                auth=subscription_data["keys"]["auth"],
+            )
+        return JsonResponse({"status": "success"})
+    except Exception as e:
+        return JsonResponse({"status": "error", "message": str(e)})
+
+
+def send_push_notification(subscription, message):
+    try:
+        webpush(
+            subscription_info={
+                "endpoint": subscription.endpoint,
+                "keys": {"p256dh": subscription.p256dh, "auth": subscription.auth},
+            },
+            data=json.dumps(message),
+            vapid_private_key=settings.WEBPUSH_SETTINGS["VAPID_PRIVATE_KEY"],
+            vapid_claims={
+                "sub": f"mailto:{settings.WEBPUSH_SETTINGS['VAPID_ADMIN_EMAIL']}"
+            },
+        )
+    except WebPushException as e:
+        print(f"Web push failed: {e}")
+
+
+@api_view(["GET", "POST"])
+@jwt_required()
+@csrf_exempt
+@permission_classes([AllowAny])
+def polls(request):
+    if request.method == "GET":
+        user = request.user
+        polls = Poll.objects.filter(participants=user)
+        pollArr = []
+        for poll in polls:
+            tempPoll = {}
+            tempPoll["id"] = poll.id
+            tempPoll["question"] = poll.question
+            tempPoll["options"] = []
+            for option in poll.options.all():
+                tempOption = {}
+                tempOption["id"] = option.id
+                tempOption["optionText"] = option.optionText
+                tempOption["count"] = option.voters.all().count()
+                tempOption["precentage"] = (
+                    option.voters.all().count() / poll.participants.all().count()
+                ) * 100
+                tempOption["voters"] = []
+                for voter in option.voters.all()[:2]:
+                    tempOption["voters"].append(
+                        {
+                            "id": voter.profile_image,
+                            "first_name": voter.first_name,
+                            "last_name": voter.last_name,
+                            "profile_image": voter.profile_image,
+                        }
+                    )
+                tempPoll["options"].append(tempOption)
+            tempPoll["created_by"] = {
+                "id": poll.created_by.profile_image,
+                "first_name": poll.created_by.first_name,
+                "last_name": poll.created_by.last_name,
+                "profile_image": poll.created_by.profile_image,
+            }
+            tempPoll["created_at"] = poll.created_at
+            pollArr.append(tempPoll)
+        return JsonResponse({"data": pollArr})
+    if request.method == "POST":
+        data = json.loads(request.body)
+        user = request.user
+        poll = Poll.objects.get(id=id)
+        option = OptionPoll.objects.get(id=data.get("option"))
+        option.votes.add(user)
+        return JsonResponse(
+            {"status": "success", "message": "Vote submitted successfully"}
+        )
+
+
+@api_view(["GET"])
+@jwt_required()
+@permission_classes([AllowAny])
+def voterList(request, id):
+    poll = Poll.objects.filter(participants=user).get(id=id)
+    if not poll:
+        return JsonResponse(
+            {"error": "Poll may not exist or you may not have access to it"}
+        )
+    else:
+        user = request.user
+        options = poll.options.all()
+        optionsList = []
+        for option in options:
+            tempOption = {}
+            tempOption["id"] = option.id
+            tempOption["optionText"] = option.optionText
+            tempOption["voters"] = []
+            for voter in option.voters.all():
+                tempOption["voters"].append(
+                    {
+                        "id": voter.profile_image,
+                        "first_name": voter.first_name,
+                        "last_name": voter.last_name,
+                        "profile_image": voter.profile_image,
+                    }
+                )
+        return JsonResponse({"data": optionsList})