micro-users 1.5.0__py3-none-any.whl → 1.6.1__py3-none-any.whl

users/tables.py

@@ -1,13 +1,13 @@
 import django_tables2 as tables
 from django.contrib.auth import get_user_model
-from .models import UserActivityLog, Department
+from django.apps import apps
 
 User = get_user_model()  # Use custom user model
 
 class UserTable(tables.Table):
     username = tables.Column(verbose_name="اسم المستخدم")
     email = tables.Column(verbose_name="البريد الالكتروني")
-    department = tables.Column(verbose_name="القسم", accessor='department.name', default='-')
+    scope = tables.Column(verbose_name="النطاق", accessor='scope.name', default='-')
     full_name = tables.Column(
         verbose_name="الاسم الكامل",
         accessor='user.full_name',
@@ -28,7 +28,7 @@ class UserTable(tables.Table):
     class Meta:
         model = User
         template_name = "django_tables2/bootstrap5.html"
-        fields = ("username", "email", "full_name", "phone", "department", "is_staff", "is_active","last_login", "actions")
+        fields = ("username", "email", "full_name", "phone", "scope", "is_staff", "is_active","last_login", "actions")
         attrs = {'class': 'table table-hover align-middle'}
 
 class UserActivityLogTable(tables.Table):
@@ -41,30 +41,34 @@ class UserActivityLogTable(tables.Table):
         accessor='user.full_name',
         order_by='user__first_name'
     )
-    department = tables.Column(
-        verbose_name="القسم",
-        accessor='user.department.name',
+    scope = tables.Column(
+        verbose_name="النطاق",
+        accessor='user.scope.name',
         default='عام'
     )
     class Meta:
-        model = UserActivityLog
+        model = apps.get_model('users', 'UserActivityLog')
         template_name = "django_tables2/bootstrap5.html"
-        fields = ("timestamp", "user", "full_name", "department", "action", "model_name", "object_id", "number")
+        fields = ("timestamp", "user", "full_name", "model_name", "action", "object_id", "number", "scope")
+        exclude = ("id", "ip_address", "user_agent")
         attrs = {'class': 'table table-hover align-middle'}
+        row_attrs = {
+            "class": lambda record: "row-deleted" if record.user and getattr(record.user, "deleted_at", None) else ""
+        }
 
 class UserActivityLogTableNoUser(UserActivityLogTable):
     class Meta(UserActivityLogTable.Meta):
-        # Remove the 'user', 'user.full_name' and 'department' columns
-        exclude = ("user", "user.full_name", "department")
+        # Remove the 'user', 'user.full_name' and 'scope' columns
+        exclude = ("user", "user.full_name", "scope")
 
-class DepartmentTable(tables.Table):
+class ScopeTable(tables.Table):
     actions = tables.TemplateColumn(
-        template_name='users/partials/department_actions.html',
+        template_name='users/partials/scope_actions.html',
         orderable=False,
         verbose_name=''
     )
     class Meta:
-        model = Department
+        model = apps.get_model('users', 'Scope')
         template_name = "django_tables2/bootstrap5.html"
         fields = ("name", "actions")
         attrs = {'class': 'table table-hover align-middle'}

users/templates/registration/login.html

@@ -3,13 +3,33 @@
 {% block title %}تسجيل الدخول{% endblock %}
 
 {% block content %}
-<link rel="stylesheet" href="{% static 'css/login.css' %}">
+<link rel="stylesheet" href="{% static 'users/css/login.css' %}">
+{% if theme %}
+<style>
+  :root {
+    {% if theme.selection_bg %}--selection-bg: {{ theme.selection_bg }} !important;{% endif %}
+    {% if theme.selection_moz_bg %}--selection-moz-bg: {{ theme.selection_moz_bg }} !important;{% endif %}
+    {% if theme.left_bg %}--left-bg: {{ theme.left_bg }} !important;{% endif %}
+    {% if theme.left_shadow %}--left-shadow: {{ theme.left_shadow }} !important;{% endif %}
+    {% if theme.right_bg %}--right-bg: {{ theme.right_bg }} !important;{% endif %}
+    {% if theme.right_shadow %}--right-shadow: {{ theme.right_shadow }} !important;{% endif %}
+    {% if theme.right_text %}--right-text: {{ theme.right_text }} !important;{% endif %}
+    {% if theme.label_color %}--label-color: {{ theme.label_color }} !important;{% endif %}
+    {% if theme.input_text %}--input-text: {{ theme.input_text }} !important;{% endif %}
+    {% if theme.submit_color %}--submit-color: {{ theme.submit_color }} !important;{% endif %}
+    {% if theme.submit_focus %}--submit-focus: {{ theme.submit_focus }} !important;{% endif %}
+    {% if theme.submit_active %}--submit-active: {{ theme.submit_active }} !important;{% endif %}
+    {% if theme.gradient_start %}--gradient-start: {{ theme.gradient_start }} !important;{% endif %}
+    {% if theme.gradient_end %}--gradient-end: {{ theme.gradient_end }} !important;{% endif %}
+  }
+</style>
+{% endif %}
 
 <div class="page">
     <div class="container d-flex">
-      <div class="right p-2 d-felx align-content-center">
+      <div class="right p-3 align-content-center">
         <div class="">
-          <img src="{% static 'img/pdf_logo.webp' %}" alt="Ministry Logo" class="img-fluid mx-auto d-block "style="width: 75%;">
+          <img src="{% static 'img/login_logo.webp' %}" alt="Login Logo" class="img-fluid mx-auto d-block logo-img">
       </div>
       {% comment %} <div class="login mb-3 text-secondary">تسجيل الدخــول</div> {% endcomment %}
     </div>
@@ -25,11 +45,11 @@
                             y2="193.49992"
                             gradientUnits="userSpaceOnUse">
               <stop
-                    style="stop-color:#c9aa5e;"
+                    style="stop-color:var(--gradient-end);"
                     offset="0"
                     id="stop876" />
               <stop
-                    style="stop-color:#cb9447;"
+                    style="stop-color:var(--gradient-start);"
                     offset="1"
                     id="stop878" />
             </linearGradient>
@@ -39,77 +59,17 @@
         <form action="{% url 'login' %}" method="POST">
             {% csrf_token %}
             <div class="form">
-                <input type="text" style="font-size: 28px;" id="username" name="username" autofocus placeholder="اسم المستخدم" required>
+                <input type="text" class="login-input" id="username" name="username" autofocus placeholder="اسم المستخدم" required>
         
-                <input type="password" style="font-size: 28px;" id="password" name="password" placeholder="كلمة المرور" required>
+                <input type="password" class="login-input" id="password" name="password" placeholder="كلمة المرور" required>
         
-                <input type="submit" style="font-size: 25px;" class="mt-5 pe-3" value="دخول" id="submit">
+                <input type="submit" class="login-submit mt-5 pe-3" value="دخول" id="submit">
             </div>
         </form>
       </div>
     </div>
   </div>
 
-<script nonce="{{ request.csp_nonce }}">
-    var current = null;
-    document.querySelector('#username').addEventListener('focus', function(e) {
-      if (current) current.pause();
-      current = anime({
-        targets: 'path',
-        strokeDashoffset: {
-          value: 0,
-          duration: 700,
-          easing: 'easeOutQuart'
-        },
-        strokeDasharray: {
-          value: '240 1386',
-          duration: 700,
-          easing: 'easeOutQuart'
-        }
-      });
-    });
-    document.querySelector('#password').addEventListener('focus', function(e) {
-      if (current) current.pause();
-      current = anime({
-        targets: 'path',
-        strokeDashoffset: {
-          value: -336,
-          duration: 700,
-          easing: 'easeOutQuart'
-        },
-        strokeDasharray: {
-          value: '240 1386',
-          duration: 700,
-          easing: 'easeOutQuart'
-        }
-      });
-    });
-    document.querySelector('#submit').addEventListener('focus', function(e) {
-      if (current) current.pause();
-      current = anime({
-        targets: 'path',
-        strokeDashoffset: {
-          value: -730,
-          duration: 700,
-          easing: 'easeOutQuart'
-        },
-        strokeDasharray: {
-          value: '530 1386',
-          duration: 700,
-          easing: 'easeOutQuart'
-        }
-      });
-    });
-
-      // New script: Hide the login button in the title bar if present.
-      document.addEventListener("DOMContentLoaded", function() {
-        // Adjust the selector to match the login button in your title bar.
-        var loginTitleButton = document.querySelector(".login-title-btn");
-        if (loginTitleButton) {
-            loginTitleButton.style.display = "none";
-        }
-    });
-</script>
-
 <script src="{% static 'js/anime.min.js' %}"></script>
+<script src="{% static 'users/js/login.js' %}"></script>
 {% endblock %}

users/templates/users/manage_users.html

@@ -1,10 +1,12 @@
 {% extends "base.html" %}
 {% load django_tables2 %}
+{% load static %}
 {% load crispy_forms_tags %}
 
 {% block title %}الاعدادت - إدارة المستخدمين{% endblock %}
 
 {% block content %}
+<link rel="stylesheet" href="{% static 'users/css/style.css' %}">
 
     <form method="get" class="py-3 g-2 no-print">
         {% crispy filter.form %}
@@ -18,9 +20,9 @@
     </div>
 
     <div class="mt-3">
-        {% if not request.user.department %}
-        <button type="button" class="btn btn-info me-2 no-print" onclick="loadDepartmentManager()">
-            <i class="bi bi-list me-1"></i> إدارة الأقسام
+        {% if not request.user.scope %}
+        <button type="button" class="btn btn-info no-print" onclick="loadScopeManager()">
+            <i class="bi bi-list me-1 h4"></i> إدارة النطاقات
         </button>
         {% endif %}
         <a href="{% url 'create_user' %}" class="btn btn-secondary no-print" title="إضافة مستخدم جديد">
@@ -52,14 +54,14 @@
     </form>
 {% endif %}
 
-    <!-- Department Management Modal -->
-    <div class="modal fade" id="departmentModal" tabindex="-1" aria-hidden="true">
+    <!-- Scope Management Modal -->
+    <div class="modal fade" id="scopeModal" tabindex="-1" aria-hidden="true">
         <div class="modal-dialog modal-lg">
             <div class="modal-content">
                 <div class="modal-header">
                     <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
                 </div>
-                <div class="modal-body" id="departmentModalBody">
+                <div class="modal-body" id="scopeModalBody">
                     <!-- Content loaded via AJAX -->
                     <div class="text-center py-5">
                         <div class="spinner-border text-primary" role="status">
@@ -71,17 +73,17 @@
         </div>
     </div>
 
-    <!-- Script for Department Modal -->
+    <!-- Script for Scope Modal -->
     <script>
         // Defined globally so they can be called from injected HTML
-        function loadDepartmentManager() {
-            const modal = new bootstrap.Modal(document.getElementById('departmentModal'));
+        function loadScopeManager() {
+            const modal = new bootstrap.Modal(document.getElementById('scopeModal'));
             modal.show();
-            loadDepartmentForm("{% url 'manage_departments' %}");
+            loadScopeForm("{% url 'manage_scopes' %}");
         }
 
-        function loadDepartmentForm(url) {
-            // Default to manage_departments if no URL (e.g. back button cases)
+        function loadScopeForm(url) {
+            // Default to manage_scopes if no URL (e.g. back button cases)
             // But actually we want distinct behavior:
             // 1. Initial Load (Table)
             // 2. Load Form (Add/Edit)
@@ -94,12 +96,12 @@
             })
             .then(response => response.json())
             .then(data => {
-                document.getElementById('departmentModalBody').innerHTML = data.html;
+                document.getElementById('scopeModalBody').innerHTML = data.html;
             })
             .catch(err => console.error('Error loading content:', err));
         }
 
-        function submitDepartmentForm(e, url) {
+        function submitScopeForm(e, url) {
             e.preventDefault();
             const form = e.target;
             const formData = new FormData(form);
@@ -115,22 +117,22 @@
             .then(data => {
                 // Whether success or error, we replace the body with the returned HTML
                 // (Updated table or Form with errors)
-                document.getElementById('departmentModalBody').innerHTML = data.html;
+                document.getElementById('scopeModalBody').innerHTML = data.html;
             })
             .catch(err => console.error('Error submitting form:', err));
         }
 
-        function deleteDepartment(url) {
+        function deleteScope(url) {
             fetch(url, {
                 headers: { 'X-Requested-With': 'XMLHttpRequest' }
             })
             .then(response => response.json())
             .then(data => {
                 if (data.success) {
-                    document.getElementById('departmentModalBody').innerHTML = data.html;
+                    document.getElementById('scopeModalBody').innerHTML = data.html;
                 }
             })
-            .catch(err => console.error('Error deleting department:', err));
+            .catch(err => console.error('Error deleting scope:', err));
         }
     </script>
 {% endblock %}

users/templates/users/partials/{department_actions.html → scope_actions.html}

@@ -1,6 +1,6 @@
 <div class="d-flex gap-2 justify-content-center">
     <button class="btn btn-sm btn-primary" 
-            onclick="loadDepartmentForm('{% url 'get_department_form' record.id %}')"
+            onclick="loadScopeForm('{% url 'get_scope_form' record.id %}')"
             title="تعديل">
         <i class="bi bi-pencil-square"></i>
     </button>

users/templates/users/partials/{department_form.html → scope_form.html}

@@ -1,13 +1,13 @@
 {% load crispy_forms_tags %}
 
 <div class="d-flex justify-content-between mb-3">
-    <h5 class="modal-title">{% if department_id %}تعديل قسم{% else %}إضافة قسم جديد{% endif %}</h5>
-    <button class="btn btn-secondary" onclick="loadDepartmentForm('{% url 'manage_departments' %}')">
+    <h5 class="modal-title">{% if scope_id %}تعديل نطاق{% else %}إضافة نطاق جديد{% endif %}</h5>
+    <button class="btn btn-secondary" onclick="loadScopeForm('{% url 'manage_scopes' %}')">
         <i class="bi bi-arrow-right me-1"></i> عودة للقائمة
     </button>
 </div>
 
-<form id="departmentForm" onsubmit="submitDepartmentForm(event, '{% url 'save_department' %}{% if department_id %}/{{ department_id }}{% endif %}')">
+<form id="scopeForm" onsubmit="submitScopeForm(event, '{% url 'save_scope' %}{% if scope_id %}/{{ scope_id }}{% endif %}')">
     {% csrf_token %}
     {% crispy form %}
     

users/templates/users/partials/{department_manager.html → scope_manager.html}

@@ -1,9 +1,9 @@
 {% load django_tables2 %}
 <div class="d-flex justify-content-between mb-3">
-    <h5 class="modal-title">إدارة الأقسام</h5>
+    <h5 class="modal-title">إدارة النطاقات</h5>
     <button class="btn btn-success" 
-            onclick="loadDepartmentForm('{% url 'get_department_form' %}')">
-        <i class="bi bi-plus-lg me-1"></i> إضافة قسم
+            onclick="loadScopeForm('{% url 'get_scope_form' %}')">
+        <i class="bi bi-plus-lg me-1"></i> إضافة نطاق
     </button>
 </div>
 

users/templates/users/user_activity_log.html

@@ -1,10 +1,12 @@
 {% extends "base.html" %}
 {% load django_tables2 %}
+{% load static %}
 {% load crispy_forms_tags %}
 
 {% block title %}الاعدادت - السجل{% endblock %}
 
 {% block content %}
+<link rel="stylesheet" href="{% static 'users/css/style.css' %}">
 
     <form method="get" class="py-3 g-2 no-print m-0">
         {% crispy filter.form %}

users/urls.py

@@ -5,7 +5,7 @@ from . import views
 from django.contrib.auth import views as auth_views
 
 urlpatterns = [
-    path('login/', auth_views.LoginView.as_view(), name='login'),
+    path('login/', views.CustomLoginView.as_view(), name='login'),
     path('logout/', auth_views.LogoutView.as_view(), name='logout'),
     path("users/", views.UserListView.as_view(), name="manage_users"),
     path('users/create/', views.create_user, name='create_user'),
@@ -17,11 +17,11 @@ urlpatterns = [
     path('reset_password/<int:pk>/', views.reset_password, name="reset_password"),
     path("users/<int:pk>/", views.UserDetailView.as_view(), name="user_detail"),
     
-    # Department Management URLs
-    path("departments/manage/", views.manage_departments, name="manage_departments"),
-    path("departments/form/", views.get_department_form, name="get_department_form"),
-    path("departments/form/<int:pk>/", views.get_department_form, name="get_department_form"),
-    path("departments/save/", views.save_department, name="save_department"),
-    path("departments/save/<int:pk>/", views.save_department, name="save_department"),
-    path("departments/delete/<int:pk>/", views.delete_department, name="delete_department"),
+    # Scope Management URLs
+    path("scopes/manage/", views.manage_scopes, name="manage_scopes"),
+    path("scopes/form/", views.get_scope_form, name="get_scope_form"),
+    path("scopes/form/<int:pk>/", views.get_scope_form, name="get_scope_form"),
+    path("scopes/save/", views.save_scope, name="save_scope"),
+    path("scopes/save/<int:pk>/", views.save_scope, name="save_scope"),
+    path("scopes/delete/<int:pk>/", views.delete_scope, name="delete_scope"),
 ]