Added filter functionality and combined both base.html

accounts/views.py

@@ -8,7 +8,7 @@ from django.views import View
 from django.views.generic import TemplateView, FormView, ListView, UpdateView
 from rest_framework.generics import get_object_or_404
 
-from accounts.forms import LoginForm, RegisterForm
+from accounts.forms import LoginForm, RegisterForm, UserChangePasswordForm
 from accounts.models import DepotUser
 
 from django.contrib.auth.decorators import login_required, user_passes_test
@@ -106,6 +106,11 @@ class UserListView(ListView):
         queryset = super().get_queryset()
         user = self.request.user
 
+        data_filter = self.request.GET.get('filter')
+
+        if data_filter != 'all':
+            queryset = queryset.filter(is_active=True)
+
         # Filter users based on permissions
         if user.is_superuser:
             return queryset.all()
@@ -184,4 +189,10 @@ class UserActiveView(LoginRequiredMixin, View):
 
         target_user.is_active = not target_user.is_active
         target_user.save()
-        return JsonResponse({'success': True, 'is_active': target_user.is_active})
+        return JsonResponse({'success': True, 'is_active': target_user.is_active})
+
+
+class UserChangePasswordView(LoginRequiredMixin, View):
+    template_name = 'registration/change_password.html'
+    form_class = UserChangePasswordForm
+    success_url = reverse_lazy('home')