micro-users 1.7.1__py3-none-any.whl → 1.8.2__py3-none-any.whl

{micro_users-1.7.1.dist-info → micro_users-1.8.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: micro-users
-Version: 1.7.1
+Version: 1.8.2
 Summary: Arabic Django user management app with abstract user, permissions, and activity logging
 Home-page: https://github.com/debeski/micro-users
 Author: DeBeski
@@ -211,3 +211,6 @@ MICRO_USERS_THEME = {
 | v1.6.3   | • **Bug Fixes**: Fixed a crash with table tooltips "disabled" |
 | v1.7.0   | • **New Theme**: Complete visual overhaul with modern, consistent styling <br> • **Refactor**: Updated Login, Profile, and Detail templates for better UX <br> • **Feature**: Added Scope filter to Activity Logs (superuser only) <br> • **UX**: Clear button in filters now preserves current sort order |
 | v1.7.1   | • **Bug Fixes**: Fixed login/next url was not being passed correctly |
+| v1.8.0   | • **Permissions UI**: Complete redesign with App/Model-based grouping and hierarchical checkboxes<br>• **Aesthetics**: Applied modern glassmorphism theme to permission cards with interactive toggles<br>• **Security**: Implemented 3-level security logic (GM, SM, User) and "invisible" Superuser protection<br>• **Foolproofing**: Added self-editing protection for staff and scope enforcement for managers<br>• **Localization**: Fully translated system auth labels and metadata to Arabic |
+| v1.8.1   | • **UI Refinement**: Swapped `Email` and `Phone` positions across all forms, tables, and detail views<br>• **Field Logic**: Set `Email` and `Phone` as optional (not required) for all users<br>• **Security**: Added `manage_staff` custom permission to restrict `is_staff` management to authorized managers only<br>• **Bug Fix**: Reserved `manage_staff` assignment power strictly for Superusers and fixed UI grouping for custom permissions |
+| v1.8.2   | • **Login UX**: Enhanced login flow with auto-focus on username and improved "Enter to Submit" handling |

{micro_users-1.7.1.dist-info → micro_users-1.8.2.dist-info}/RECORD

@@ -1,30 +1,31 @@
 users/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 users/admin.py,sha256=CRS5muWUSXUC2pQteSCgUgpFjPtGnx1b5z1daODjUMM,1359
-users/apps.py,sha256=rX3NqBsz2zC_spZbHJ_tbhNwkEFaspPjpS19qil9WBo,1162
+users/apps.py,sha256=elucgGYMWg-ASRP-x495pn5mmj6XqyCbIIMFse8bSiQ,1471
 users/filters.py,sha256=_uvi1qLEE7aLqKLwjIpv6dflKlyFd0t0Muv6IXBfIxw,6094
-users/forms.py,sha256=4poq6wlFysX_r0KFxUd9I2K9eXhOHV36iSTjncRYHyc,16531
+users/forms.py,sha256=OU0Llhphn8euUZiNAk53rqGiIshX6m-IAAxcCsX1Vig,21494
 users/middleware.py,sha256=CgzmKb6_4TUkwMZ0h7UgQd80DKUXsmzKvsc3V2JIujY,976
-users/models.py,sha256=XyA4UaRp4DufvgBJKtAGyal3Ci3fZxevyd1fIPqrpEw,2679
+users/models.py,sha256=GnKNG8H2Ug2ammGTHUCa4G8Pj4tVp3FOOXZciBrfBns,2781
 users/signals.py,sha256=blAx8nHsfmn89hMyRBR0Jf706Z07N81ObQMY_MHaBv8,4543
-users/tables.py,sha256=6zsQBhlEA74BYsSzzmYeFE0Ll7vZmT8aKMsqRUw_l-k,2968
+users/tables.py,sha256=VTsp6BvhvjGqmDMzZK5J60SEFYNpeCrBRfpkazmlC-8,3030
 users/urls.py,sha256=hg4fiVkWcQlbZ82SZ_HjeFPQUkmK1Y7c1ho_lWBFDRg,1491
-users/views.py,sha256=HGa0x8tVY4ltSelOxHdknjsft9fMKfQTKoXvMaMPlbg,14246
+users/views.py,sha256=vfEF5fhJv1t6iojHU3bKyWZYEKxSJqn8-KbJuoNGMkA,14566
 users/migrations/0001_initial.py,sha256=lx9sSKS-lxHhI6gelVH52NOkwqEMJ32TvOJUn9zaOXM,4709
 users/migrations/0002_alter_useractivitylog_action.py,sha256=I7NLxgcPTslCMuADcr1srXS_C_0y_LcZiAFFHBG5NsE,715
-users/migrations/0003_scope_alter_customuser_options_and_more.py,sha256=sp3c_NFCuKwSO7ZZ3zPMYWuD7OUhZaq7993lTGQhnmY,1672
+users/migrations/0003_scope_alter_customuser_options_and_more.py,sha256=yBtDJ2T0_4c1Q2yedUNeLoDu61vfJmll7MnqRIDG2Rc,1745
 users/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 users/static/img/default_profile.webp,sha256=BKUoQHo4z_fZnmc6z6I-KFvLEHahDr98U9LnDQKHLAM,3018
 users/static/img/login_logo.webp,sha256=LdLMqrBlBczctcJVfLk-oxasjqcOgYnvHZ17ZMusVNE,27570
 users/static/users/css/detail.css,sha256=YB1XMBmEQluk0WcM3AZ3XKNK4z6f2tFXurz-2igQH7c,1102
 users/static/users/css/login.css,sha256=9TdAt3Cfro4GCWrYK8W9-c-6zr3DbuwsbiFwZ4uBtZM,4171
+users/static/users/css/permissions.css,sha256=b5XwKZKqJvU8iTlSC8P2EIDflSUb-0PP-OzYzwqLdh0,2230
 users/static/users/css/profile.css,sha256=AZVDK0gFwGo0vgPrmZ0BJVAxax8Icf2h8WFVNbt1UeU,2908
 users/static/users/css/style.css,sha256=rlLk1P4uxw9TKwsFTmXR77gYy0bVptwjzO_m3VGlYDo,1789
-users/static/users/js/anime.min.js,sha256=pD9KZEZQimTLQOMTT99lBhGT7AXyMPz3g92G1iyd470,17179
-users/static/users/js/login.js,sha256=ayXC8B5caDNNKL2UDwnDC2BA3lcNHkJu4PPXLDsviDw,1379
-users/templates/registration/login.html,sha256=V1w1rJbBTkR2l2h3cs4Jn7F5257KtdhqjEFXjCWNhn8,2981
+users/static/users/js/login.js,sha256=PmUXzsb1OYKne6XPZwolbTLWEZsl77J0pgRYakam1Wg,883
+users/static/users/js/permissions.js,sha256=v2h5JKAdhXYoLwOEK6hc82MWqbKS_zcUVQgFPKC3vV0,3658
+users/templates/registration/login.html,sha256=Ok9BEEBKjevbJVhEta_UC66LssNviefhpjoslhrdiFc,2926
 users/templates/users/manage_users.html,sha256=tIPkdFxm9lC_R184WQlm0UHV7sUS_xNo6f8AjgW18S8,6359
 users/templates/users/user_activity_log.html,sha256=nKVOvmkbVjGWZZyYNJahs7drWQFh_hvyUDWuauwJV6U,571
-users/templates/users/user_detail.html,sha256=a_LqslwZOb15yFf1OItxrIWRbeoxK6Tp58ajjlodYc8,5290
+users/templates/users/user_detail.html,sha256=FAPQYXr5qNgzaZ-mAnaNoCb8dVsUHtj_hY87ZYO9_d0,5302
 users/templates/users/user_form.html,sha256=jcyI7OQZOY4ue4DajPtfjAt2SmAYO5ZgHNOqTp2-FO0,1352
 users/templates/users/partials/scope_actions.html,sha256=pAcxNMmUHgeZ6baR9pHhy8HUU35emFEb8PDBPnqBSNo,273
 users/templates/users/partials/scope_form.html,sha256=XSUeEoRM-wzDZNFv7AJQBH5TFgaPF1FmwfrKRZ8fpdI,741
@@ -32,9 +33,9 @@ users/templates/users/partials/scope_manager.html,sha256=mqhSg2NA2U_Dc5bIf3OUasT
 users/templates/users/partials/user_actions.html,sha256=J44-sn0fMbLUWjdtlcf5YhgT5OYRykr1mFkeVXoI1ew,1543
 users/templates/users/profile/profile.html,sha256=HXxOWsGEAZb731iF-nY00dzbFcgVh60oF0C1X8AySb4,5377
 users/templates/users/profile/profile_edit.html,sha256=hhltTIdl62NNX290nFNZcQwbW1idXEU_DYlrAp07MWk,5242
-users/templates/users/widgets/grouped_permissions.html,sha256=VE7Trm1xBdpMmCMLc--YAbjGxDQj6TxDVwpphe8WuQE,9950
-micro_users-1.7.1.dist-info/LICENSE,sha256=Fco89ULLSSxKkC2KKnx57SaT0R7WOkZfuk8IYcGiN50,1063
-micro_users-1.7.1.dist-info/METADATA,sha256=EB2GyE4wpQfrtxu-Ma2CfleKAlaYIRP0-lUoVr_n75c,10026
-micro_users-1.7.1.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-micro_users-1.7.1.dist-info/top_level.txt,sha256=tWT24ZcWau2wrlbpU_h3mP2jRukyLaVYiyHBuOezpLQ,6
-micro_users-1.7.1.dist-info/RECORD,,
+users/templates/users/widgets/grouped_permissions.html,sha256=y608c0rJlj73XBmZBNzjTbNlF7dlJf4AceN_g0mCbmA,4087
+micro_users-1.8.2.dist-info/LICENSE,sha256=Fco89ULLSSxKkC2KKnx57SaT0R7WOkZfuk8IYcGiN50,1063
+micro_users-1.8.2.dist-info/METADATA,sha256=_Dh-lrkRgm9txb5DrEZ94vI9dJvhSqYH2owxzvIuz-U,11117
+micro_users-1.8.2.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+micro_users-1.8.2.dist-info/top_level.txt,sha256=tWT24ZcWau2wrlbpU_h3mP2jRukyLaVYiyHBuOezpLQ,6
+micro_users-1.8.2.dist-info/RECORD,,

users/apps.py

@@ -4,20 +4,21 @@ from django.apps import AppConfig
 
 def custom_permission_str(self):
     """Custom Arabic translations for Django permissions"""
-    model_name = str(self.content_type)
     permission_name = str(self.name)
 
-    # Translate default permissions
-    if "Can add" in permission_name:
-        permission_name = permission_name.replace("Can add", " إضافة ")
-    elif "Can change" in permission_name:
-        permission_name = permission_name.replace("Can change", " تعديل ")
-    elif "Can delete" in permission_name:
-        permission_name = permission_name.replace("Can delete", " حذف ")
-    elif "Can view" in permission_name:
-        permission_name = permission_name.replace("Can view", " عرض ")
+    # Translation map for keywords
+    replacements = {
+        "Can add": "إضافة",
+        "Can change": "تعديل",
+        "Can delete": "حذف",
+        "Can view": "عرض",
+        "permission": "الصلاحيات",
+    }
 
-    return f"{permission_name}"
+    for en, ar in replacements.items():
+        permission_name = permission_name.replace(en, ar)
+
+    return permission_name.strip()
 
 
 class UsersConfig(AppConfig):
@@ -27,5 +28,17 @@ class UsersConfig(AppConfig):
 
     def ready(self):
         from django.contrib.auth.models import Permission
-        Permission.__str__ = custom_permission_str
+        from django.apps import apps
+        
+        # Set Arabic verbose names for Auth app and Permission model
+        try:
+            auth_config = apps.get_app_config('auth')
+            auth_config.verbose_name = "نظام المصادقة" # "Auth" -> Identity/Authentication
+            
+            Permission.__str__ = custom_permission_str
+            Permission._meta.verbose_name = "ادارة الصلاحيات"
+            Permission._meta.verbose_name_plural = "الصلاحيات"
+        except (LookupError, AttributeError):
+            pass
+
         import users.signals

users/forms.py

@@ -49,6 +49,25 @@ class GroupedPermissionWidget(ChoiceWidget):
         
         for perm in qs:
             app_label = perm.content_type.app_label
+            model_name = perm.content_type.model
+            codename = perm.codename
+
+            # --- Mapping manage_staff to auth.Permission UI ---
+            if app_label == 'users' and codename == 'manage_staff':
+                app_label = 'auth'
+                model_name = 'permission'
+            # -------------------------------------------------
+
+            # Use real verbose name from model class if available
+            if app_label == 'auth' and model_name == 'permission':
+                # Special case: use the verbose name of the Permission model
+                model_verbose_name = "الصلاحيات" # Or fetch from apps.get_model('auth', 'Permission')._meta.verbose_name
+            else:
+                model_class = perm.content_type.model_class()
+                if model_class:
+                    model_verbose_name = str(model_class._meta.verbose_name)
+                else:
+                    model_verbose_name = perm.content_type.name
             
             # Fetch verbose app name
             try:
@@ -57,7 +76,7 @@ class GroupedPermissionWidget(ChoiceWidget):
             except LookupError:
                 app_verbose_name = app_label.title()
 
-            # Determine action
+            # Determine action for CSS/JS filtering if needed (legacy or utility)
             action = 'other'
             codename = perm.codename
             if codename.startswith('view_'): action = 'view'
@@ -71,29 +90,37 @@ class GroupedPermissionWidget(ChoiceWidget):
             option = {
                 'name': name,
                 'value': perm.pk,
-                'label': str(perm), # Force string conversion to use custom __str__ method
+                'label': str(perm),
+                'codename': codename,
                 'selected': str(perm.pk) in str_values,
                 'attrs': {
                     'id': f"{current_id}_{perm.pk}",
-                    'data_action': action  # Critical for JS global select
+                    'data_action': action,
+                    'data_model': model_name
                 }
             }
             
             if app_label not in grouped_perms:
                 grouped_perms[app_label] = {
                     'name': app_verbose_name,
-                    'actions': {}
+                    'models': {}
+                }
+            
+            if model_name not in grouped_perms[app_label]['models']:
+                grouped_perms[app_label]['models'][model_name] = {
+                    'name': model_verbose_name.title(),
+                    'permissions': []
                 }
             
-            grouped_perms[app_label]['actions'].setdefault(action, []).append(option)
+            grouped_perms[app_label]['models'][model_name]['permissions'].append(option)
         
-        # Sort actions within each app: View -> Add -> Change -> Delete -> Other
+        # Sort permissions within each model: View -> Add -> Change -> Delete -> Other
         action_order = {'view': 1, 'add': 2, 'change': 3, 'delete': 4, 'other': 5}
         for app_label, app_data in grouped_perms.items():
-            app_data['actions'] = dict(sorted(
-                app_data['actions'].items(),
-                key=lambda item: action_order.get(item[0], 99)
-            ))
+            for model_name, model_data in app_data['models'].items():
+                model_data['permissions'].sort(
+                    key=lambda x: action_order.get(x['attrs']['data_action'], 99)
+                )
             
         context['widget']['grouped_perms'] = grouped_perms
         return context
@@ -113,12 +140,12 @@ class CustomUserCreationForm(UserCreationForm):
             Q(codename__regex=r'^(delete_)') |
             Q(content_type__app_label__in=[
                 'admin',
-                'auth',
                 'contenttypes',
                 'sessions',
                 'django_celery_beat',
-                'users'
-            ])
+            ]) |
+            (Q(content_type__app_label='users') & ~Q(codename='manage_staff')) |
+            Q(content_type__app_label='auth', content_type__model__in=['group', 'user'])
         ),
         required=False,
         widget=GroupedPermissionWidget,
@@ -127,15 +154,34 @@ class CustomUserCreationForm(UserCreationForm):
 
     class Meta:
         model = User
-        fields = ["username", "email", "password1", "password2", "first_name", "last_name", "phone", "scope", "is_staff", "permissions", "is_active"]
+        fields = ["username", "phone", "password1", "password2", "first_name", "last_name", "email", "scope", "is_staff", "permissions", "is_active"]
 
     def __init__(self, *args, **kwargs):
         self.user = kwargs.pop('user', None)
         super().__init__(*args, **kwargs)
         
+        # Permission check: Non-superusers can only assign permissions they already have
+        if self.user and not self.user.is_superuser:
+            user_perms = self.user.user_permissions.all() | Permissions.objects.filter(group__user=self.user)
+            self.fields['permissions'].queryset = self.fields['permissions'].queryset.filter(id__in=user_perms.values_list('id', flat=True))
+        
         if self.user and not self.user.is_superuser and self.user.scope:
             self.fields['scope'].initial = self.user.scope
             self.fields['scope'].disabled = True
+        # Security Fix: Hide manage_staff from the selection list for all non-superusers
+            self.fields['permissions'].queryset = self.fields['permissions'].queryset.exclude(codename='manage_staff')
+        
+        # --- Field Requirements ---
+        self.fields["email"].required = False
+        self.fields["phone"].required = False
+
+        # --- can_manage_staff logic ---
+        if self.user and not self.user.is_superuser:
+            if not self.user.has_perm('users.manage_staff'):
+                self.fields['is_staff'].disabled = True
+                self.fields['is_staff'].initial = False
+                self.fields['is_staff'].help_text = "ليس لديك صلاحية لتعيين هذا المستخدم كمسؤول."
+
         
         self.fields["username"].label = "اسم المستخدم"
         self.fields["email"].label = "البريد الإلكتروني"
@@ -158,7 +204,7 @@ class CustomUserCreationForm(UserCreationForm):
         self.helper = FormHelper()
         self.helper.layout = Layout(
             "username",
-            "email",
+            "phone",
             "password1",
             "password2",
             HTML("<hr>"),
@@ -168,7 +214,7 @@ class CustomUserCreationForm(UserCreationForm):
                 css_class="row"
             ),
             Div(
-                Div(Field("phone", css_class="col-md-6"), css_class="col-md-6"),
+                Div(Field("email", css_class="col-md-6"), css_class="col-md-6"),
                 Div(Field("scope", css_class="col-md-6"), css_class="col-md-6"),
                 css_class="row"
             ),
@@ -211,12 +257,12 @@ class CustomUserChangeForm(UserChangeForm):
             Q(codename__regex=r'^(delete_)') |
             Q(content_type__app_label__in=[
                 'admin',
-                'auth',
                 'contenttypes',
                 'sessions',
                 'django_celery_beat',
-                'users'
-            ])
+            ]) |
+            (Q(content_type__app_label='users') & ~Q(codename='manage_staff')) |
+            Q(content_type__app_label='auth', content_type__model__in=['group', 'user'])
         ),
         required=False,
         widget=GroupedPermissionWidget,
@@ -225,16 +271,18 @@ class CustomUserChangeForm(UserChangeForm):
 
     class Meta:
         model = User
-        fields = ["username", "email", "first_name", "last_name", "phone", "scope", "is_staff",  "permissions", "is_active"]
+        fields = ["username", "phone", "first_name", "last_name", "email", "scope", "is_staff",  "permissions", "is_active"]
 
     def __init__(self, *args, **kwargs):
         self.user = kwargs.pop('user', None)
         user_instance = kwargs.get('instance')
         super().__init__(*args, **kwargs)
 
-        if self.user and not self.user.is_superuser and self.user.scope:
-            self.fields['scope'].disabled = True
-        
+        # Permission check: Non-superusers can only assign permissions they already have
+        if self.user and not self.user.is_superuser:
+            user_perms = self.user.user_permissions.all() | Permissions.objects.filter(group__user=self.user)
+            self.fields['permissions'].queryset = self.fields['permissions'].queryset.filter(id__in=user_perms.values_list('id', flat=True))
+
         # Labels
         self.fields["username"].label = "اسم المستخدم"
         self.fields["email"].label = "البريد الإلكتروني"
@@ -248,16 +296,47 @@ class CustomUserChangeForm(UserChangeForm):
         self.fields["email"].help_text = "أدخل عنوان البريد الإلكتروني الصحيح"
         self.fields["is_staff"].help_text = "يحدد ما إذا كان بإمكان المستخدم الوصول إلى قسم ادارة المستخدمين."
         self.fields["is_active"].help_text = "يحدد ما إذا كان يجب اعتبار هذا الحساب نشطًا. قم بإلغاء تحديد هذا الخيار بدلاً من الحذف."
-        
+
         if user_instance:
             self.fields["permissions"].initial = user_instance.user_permissions.all()
 
+        # --- Foolproofing & Role-based logic ---
+        if self.user and not self.user.is_superuser:
+            # 1. Self-Editing Protection (Prevents accidental demotion)
+            if self.user == user_instance:
+                if self.user.is_staff:
+                    self.fields['scope'].disabled = True
+                    self.fields['is_staff'].disabled = True
+                    self.fields['is_active'].disabled = True
+                    # Optional: Add help text to explain why it's disabled
+                    self.fields['scope'].help_text = "لا يمكنك تغيير نطاقك الخاص لمنع تجريد نفسك من صلاحيات المدير العام."
+                    # Security Fix: Hide manage_staff from the selection list for all non-superusers
+                    self.fields['permissions'].queryset = self.fields['permissions'].queryset.exclude(codename='manage_staff')
+            
+            # 2. Scope Manager Restrictions (Staff with a scope)
+            elif self.user.scope:
+                # SMs cannot change the scope of anyone (they only manage their own scope)
+                self.fields['scope'].disabled = True
+                self.fields['scope'].initial = self.user.scope
+        
+        # --- Field Requirements ---
+        self.fields["email"].required = False
+        self.fields["phone"].required = False
+
+        # --- can_manage_staff logic ---
+        if self.user and not self.user.is_superuser:
+            if not self.user.has_perm('users.manage_staff'):
+                self.fields['is_staff'].disabled = True
+                # Initial value remains instance.is_staff unless we want to force something else
+                self.fields['is_staff'].help_text = "ليس لديك صلاحية لتغيير وضع هذا المستخدم لمسؤول ."
+        # ----------------------------------------
+
         # Use Crispy Forms Layout helper
         self.helper = FormHelper()
         self.helper.form_tag = False
         self.helper.layout = Layout(
             "username",
-            "email",
+            "phone",
             HTML("<hr>"),
             Div(
                 Div(Field("first_name", css_class="col-md-6"), css_class="col-md-6"),
@@ -265,7 +344,7 @@ class CustomUserChangeForm(UserChangeForm):
                 css_class="row"
             ),
             Div(
-                Div(Field("phone", css_class="col-md-6"), css_class="col-md-6"),
+                Div(Field("email", css_class="col-md-6"), css_class="col-md-6"),
                 Div(Field("scope", css_class="col-md-6"), css_class="col-md-6"),
                 css_class="row"
             ),
@@ -339,16 +418,20 @@ class ResetPasswordForm(SetPasswordForm):
 class UserProfileEditForm(forms.ModelForm):
     class Meta:
         model = User
-        fields = ['username', 'email', 'first_name', 'last_name', 'phone', 'profile_picture']
+        fields = ['username', 'phone', 'first_name', 'last_name', 'email', 'profile_picture']
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.fields['username'].disabled = True  # Prevent the user from changing their username
-        self.fields['email'].label = "البريد الالكتروني"  # Prevent the user from changing their email
+        self.fields['phone'].label = "رقم الهاتف"
         self.fields['first_name'].label = "الاسم الاول"
         self.fields['last_name'].label = "اللقب"
-        self.fields['phone'].label = "رقم الهاتف"
+        self.fields['email'].label = "البريد الالكتروني"
         self.fields['profile_picture'].label = "الصورة الشخصية"
+        
+        # --- Field Requirements ---
+        self.fields["email"].required = False
+        self.fields["phone"].required = False
 
     def clean_profile_picture(self):
         profile_picture = self.cleaned_data.get('profile_picture')

users/migrations/0003_scope_alter_customuser_options_and_more.py

@@ -1,4 +1,4 @@
-# Generated by Django 5.2.8 on 2026-01-26 11:53
+# Generated by Django 5.2.8 on 2026-01-27 23:46
 
 import django.db.models.deletion
 from django.db import migrations, models
@@ -24,7 +24,7 @@ class Migration(migrations.Migration):
         ),
         migrations.AlterModelOptions(
             name='customuser',
-            options={'verbose_name': 'مستخدم', 'verbose_name_plural': 'المستخدمين'},
+            options={'permissions': [('manage_staff', 'صلاحية إنشاء مسؤول')], 'verbose_name': 'مستخدم', 'verbose_name_plural': 'المستخدمين'},
         ),
         migrations.AlterModelOptions(
             name='useractivitylog',

users/models.py

@@ -28,6 +28,9 @@ class CustomUser(AbstractUser):
     class Meta:
         verbose_name = "مستخدم"
         verbose_name_plural = "المستخدمين"
+        permissions = [
+            ("manage_staff", "صلاحية إنشاء مسؤول"),
+        ]
 
 class UserActivityLog(models.Model):
     ACTION_TYPES = [

users/static/users/css/permissions.css

@@ -0,0 +1,105 @@
+.permissions-card {
+    background: rgba(255, 255, 255, 0.95);
+    border: 1px solid rgba(0, 0, 0, 0.1);
+    border-radius: 12px;
+    transition: transform 0.2s ease, box-shadow 0.2s ease;
+    overflow: hidden;
+    margin-bottom: 1.5rem;
+}
+
+.permissions-card:hover {
+    box-shadow: 0 4px 15px rgba(0, 0, 0, 0.1);
+    transform: translateY(-2px);
+}
+
+.permissions-card-header {
+    background: rgba(var(--primal-rgb, 13, 110, 253), 0.03);
+    padding: 0.75rem 1.25rem;
+    cursor: pointer;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    user-select: none;
+    transition: background 0.2s ease;
+}
+
+.permissions-card-header:hover {
+    background: rgba(var(--primal-rgb, 13, 110, 253), 0.1);
+}
+
+.bg-soft-primary {
+    background-color: rgba(var(--primal-rgb, 13, 110, 253), 0.1) !important;
+}
+
+.text-primary {
+    color: var(--primal_dark, #0d6efd) !important;
+}
+
+.permissions-card-header .app-title {
+    font-size: 1.1rem;
+    font-weight: 600;
+    margin: 0;
+    color: var(--primal_dark, #212529);
+}
+
+.permissions-card-body {
+    padding: 1.25rem;
+}
+
+.model-group {
+    background: rgba(255, 255, 255, 0.5);
+    border-radius: 8px;
+    padding: 1rem;
+    margin-bottom: 1rem;
+    border: 1px solid rgba(0, 0, 0, 0.05);
+}
+
+.model-group:last-child {
+    margin-bottom: 0;
+}
+
+.model-header {
+    display: flex;
+    align-items: center;
+    margin-bottom: 0.75rem;
+    padding-bottom: 0.5rem;
+    border-bottom: 1px dashed rgba(0, 0, 0, 0.1);
+}
+
+.model-title {
+    font-size: 0.95rem;
+    font-weight: 600;
+    margin: 0;
+}
+
+.permission-item {
+    padding: 0.25rem 0.5rem;
+    border-radius: 4px;
+    transition: background 0.2s ease;
+}
+
+.permission-item:hover {
+    background: rgba(var(--primal-rgb, 13, 110, 253), 0.05);
+}
+
+.toggle-icon {
+    transition: transform 0.3s ease;
+}
+
+.collapsed .toggle-icon {
+    transform: rotate(-90deg);
+}
+
+[data-bs-theme="dark"] .permissions-card {
+    background: rgba(43, 48, 53, 0.7);
+    border: 1px solid rgba(255, 255, 255, 0.1);
+}
+
+[data-bs-theme="dark"] .permissions-card-header {
+    background: rgba(255, 255, 255, 0.05);
+}
+
+[data-bs-theme="dark"] .model-group {
+    background: rgba(0, 0, 0, 0.2);
+    border: 1px solid rgba(255, 255, 255, 0.05);
+}

users/static/users/js/login.js

@@ -1,55 +1,3 @@
-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'
-    }
-  });
-});
 
 // Hide the login button in the title bar if present.
 document.addEventListener("DOMContentLoaded", function() {
@@ -57,4 +5,24 @@ document.addEventListener("DOMContentLoaded", function() {
     if (loginTitleButton) {
         loginTitleButton.style.display = "none";
     }
+
+    // Autofocus on username field
+    var usernameField = document.getElementById("username");
+    if (usernameField) {
+        usernameField.focus();
+    }
+
+    // Handle Enter key press for form submission
+    var loginInputs = document.querySelectorAll(".login-input");
+    loginInputs.forEach(function(input) {
+        input.addEventListener("keydown", function(e) {
+            if (e.key === "Enter") {
+                e.preventDefault();
+                var form = input.closest("form");
+                if (form) {
+                    form.submit();
+                }
+            }
+        });
+    });
 });

users/static/users/js/permissions.js

@@ -0,0 +1,85 @@
+document.addEventListener('DOMContentLoaded', function() {
+    console.log('Permissions Widget JS Loaded');
+
+    // Handle Card Header Clicks for Toggle
+    document.querySelectorAll('.permissions-card-header').forEach(header => {
+        header.addEventListener('click', function(e) {
+            // Prevent toggle if clicking directly on the checkbox
+            if (e.target.closest('.form-check')) return;
+
+            const targetId = this.getAttribute('data-bs-target');
+            const target = document.querySelector(targetId);
+            if (target) {
+                const isCollapsed = target.classList.contains('show');
+                if (isCollapsed) {
+                    this.classList.add('collapsed');
+                    bootstrap.Collapse.getOrCreateInstance(target).hide();
+                } else {
+                    this.classList.remove('collapsed');
+                    bootstrap.Collapse.getOrCreateInstance(target).show();
+                }
+            }
+        });
+    });
+
+    // Master Checkbox Logic: App Level
+    document.querySelectorAll('.app-master-checkbox').forEach(master => {
+        master.addEventListener('change', function() {
+            const isChecked = this.checked;
+            const card = this.closest('.permissions-card');
+            card.querySelectorAll('.permission-checkbox, .model-master-checkbox').forEach(cb => {
+                cb.checked = isChecked;
+                cb.indeterminate = false;
+            });
+            updateGlobalStatus();
+        });
+    });
+
+    // Master Checkbox Logic: Model Level
+    document.querySelectorAll('.model-master-checkbox').forEach(master => {
+        master.addEventListener('change', function() {
+            const isChecked = this.checked;
+            const modelGroup = this.closest('.model-group');
+            modelGroup.querySelectorAll('.permission-checkbox').forEach(cb => {
+                cb.checked = isChecked;
+            });
+            updateAppMasterStatus(this.closest('.permissions-card'));
+            updateGlobalStatus();
+        });
+    });
+
+    // Individual Permission Checkbox Logic
+    document.querySelectorAll('.permission-checkbox').forEach(cb => {
+        cb.addEventListener('change', function() {
+            updateModelMasterStatus(this.closest('.model-group'));
+            updateAppMasterStatus(this.closest('.permissions-card'));
+            updateGlobalStatus();
+        });
+    });
+
+    function updateModelMasterStatus(modelGroup) {
+        const master = modelGroup.querySelector('.model-master-checkbox');
+        const children = modelGroup.querySelectorAll('.permission-checkbox');
+        const checkedCount = Array.from(children).filter(c => c.checked).length;
+
+        master.checked = checkedCount === children.length && children.length > 0;
+        master.indeterminate = checkedCount > 0 && checkedCount < children.length;
+    }
+
+    function updateAppMasterStatus(card) {
+        const master = card.querySelector('.app-master-checkbox');
+        const children = card.querySelectorAll('.permission-checkbox');
+        const checkedCount = Array.from(children).filter(c => c.checked).length;
+
+        master.checked = checkedCount === children.length && children.length > 0;
+        master.indeterminate = checkedCount > 0 && checkedCount < children.length;
+    }
+
+    function updateGlobalStatus() {
+        // Optional: Update top-level "Global" selectors if any remain
+    }
+
+    // Initial State Sync
+    document.querySelectorAll('.model-group').forEach(group => updateModelMasterStatus(group));
+    document.querySelectorAll('.permissions-card').forEach(card => updateAppMasterStatus(card));
+});

users/tables.py

@@ -6,6 +6,7 @@ User = get_user_model()  # Use custom user model
 
 class UserTable(tables.Table):
     username = tables.Column(verbose_name="اسم المستخدم")
+    phone = tables.Column(verbose_name="رقم الهاتف")
     email = tables.Column(verbose_name="البريد الالكتروني")
     scope = tables.Column(verbose_name="النطاق", accessor='scope.name', default='-')
     full_name = tables.Column(
@@ -28,7 +29,7 @@ class UserTable(tables.Table):
     class Meta:
         model = User
         template_name = "django_tables2/bootstrap5.html"
-        fields = ("username", "email", "full_name", "phone", "scope", "is_staff", "is_active","last_login", "actions")
+        fields = ("username", "phone", "email", "full_name", "scope", "is_staff", "is_active","last_login", "actions")
         attrs = {'class': 'table table-hover align-middle'}
 
 class UserActivityLogTable(tables.Table):

users/templates/registration/login.html

@@ -58,6 +58,5 @@
     </div>
   </div>
 
-<script src="{% static 'js/anime.min.js' %}"></script>
 <script src="{% static 'users/js/login.js' %}"></script>
 {% endblock %}

users/templates/users/user_detail.html

@@ -46,15 +46,15 @@
                             <div class="info-value-lg">{{ object.get_full_name }}</div>
                         </div>
                         <div class="info-group">
-                            <div class="info-label-sm">رقم الهاتف</div>
-                            <div class="info-value-lg">{{ object.phone|default:"-" }}</div>
+                            <div class="info-label-sm">البريد الإلكتروني</div>
+                            <div class="info-value-lg">{{ object.email|default:"-" }}</div>
                         </div>
                     </div>
                     
                     <div class="col-md-6 pe-md-4">
                         <div class="info-group">
-                            <div class="info-label-sm">البريد الإلكتروني</div>
-                            <div class="info-value-lg">{{ object.email }}</div>
+                            <div class="info-label-sm">رقم الهاتف</div>
+                            <div class="info-value-lg">{{ object.phone|default:"-" }}</div>
                         </div>
                         <div class="info-group">
                             <div class="info-label-sm">نوع الصلاحيات</div>

users/templates/users/widgets/grouped_permissions.html

@@ -1,210 +1,75 @@
+{% load static %}
+
 {% with id=widget.attrs.id %}
 <div class="grouped-permissions-widget" id="{{ id }}_container">
+    <link rel="stylesheet" href="{% static 'users/css/permissions.css' %}">
     
-    <!-- Top Bar: Global Controls -->
-    <div class="card mb-3 shadow-sm">
-        <div class="card-body d-flex justify-content-between align-items-center flex-wrap gap-2">
-            <div class="form-check form-check-inline">
-                <input class="form-check-input global-select" type="checkbox" id="{{ id }}_global_view" data-action-target="view">
-                <label class="form-check-label fw-bold" for="{{ id }}_global_view">عرض الكل</label>
-            </div>
-            <div class="form-check form-check-inline">
-                <input class="form-check-input global-select" type="checkbox" id="{{ id }}_global_add" data-action-target="add">
-                <label class="form-check-label fw-bold" for="{{ id }}_global_add">إضافة الكل</label>
-            </div>
-            <div class="form-check form-check-inline">
-                <input class="form-check-input global-select" type="checkbox" id="{{ id }}_global_change" data-action-target="change">
-                <label class="form-check-label fw-bold" for="{{ id }}_global_change">تعديل الكل</label>
-            </div>
-            <div class="form-check form-check-inline">
-                <input class="form-check-input global-select" type="checkbox" id="{{ id }}_global_other" data-action-target="other">
-                <label class="form-check-label fw-bold" for="{{ id }}_global_other">الـأخرى</label>
-            </div>
-            
-            <button type="button" class="btn btn-outline-primary ms-auto" data-bs-toggle="collapse" 
-                    data-bs-target="#{{ id }}_detailed_list" aria-expanded="false" aria-controls="{{ id }}_detailed_list">
-                <i class="bi bi-list-check" title="إظهار قائمة تحتوي على كل الصلاحيات"></i> إظهار كل الصلاحيات
-            </button>
-        </div>
-    </div>
-
-    <!-- Collapsible Detailed List -->
-    <div class="collapse" id="{{ id }}_detailed_list">
+    <div class="detailed-list mt-3">
         {% for app_label, app_data in widget.grouped_perms.items %}
-        <div class="card mb-3">
-            <div class="card-header bg-light">
-                <h5 class="mb-0 text-capitalize">{{ app_data.name }}</h5>
-            </div>
-            <div class="card-body">
-                {% for action_name, options in app_data.actions.items %}
-                <div class="permission-group mb-2 pb-2 border-bottom">
-                    <div class="d-flex align-items-center mb-2">
-                        <div class="form-check">
-                            <input type="checkbox" class="form-check-input group-checkbox" 
-                                   id="{{ id }}_{{ app_label }}_{{ action_name }}_all"
-                                   data-group-target="{{ id }}_{{ app_label }}_{{ action_name }}_group">
-                            <label class="form-check-label fw-bold" for="{{ id }}_{{ app_label }}_{{ action_name }}_all">
-                            {% if action_name == 'view' %}
-                                عرض الكل ({{ options|length }})
-                            {% elif action_name == 'change' %}
-                                تعديل الكل ({{ options|length }})
-                            {% elif action_name == 'add' %}
-                                إضافة الكل ({{ options|length }})
-                            {% elif action_name == 'delete' %}
-                                حذف الكل ({{ options|length }})
-                            {% else %}
-                                {{ action_name|title }} الكل ({{ options|length }})
-                            {% endif %}
-                            </label>
-                        </div>
+        <div class="permissions-card">
+            <!-- Header serves as both master checkbox and toggle -->
+            <div class="permissions-card-header collapsed" 
+                 data-bs-toggle="collapse" 
+                 data-bs-target="#collapse_{{ app_label }}" 
+                 aria-expanded="false">
+                
+                <div class="d-flex align-items-center">
+                    <div class="form-check me-3" onclick="event.stopPropagation()">
+                        <input class="form-check-input app-master-checkbox" type="checkbox" id="master_{{ app_label }}">
+                        <label class="form-check-label d-none" for="master_{{ app_label }}">تحديد الكل</label>
                     </div>
+                    <h5 class="app-title">{{ app_data.name|title }}</h5>
+                </div>
+                
+                <div class="d-flex align-items-center">
+                    <span class="badge bg-soft-primary text-primary border-primary me-3 px-2 py-1">
+                        {{ app_data.models|length }} وحدة
+                    </span>
+                    <i class="bi bi-chevron-down toggle-icon"></i>
+                </div>
+            </div>
 
-                    <div class="row row-cols-1 row-cols-md-2 g-2 ps-4 {{ id }}_{{ app_label }}_{{ action_name }}_group">
-                        {% for option in options %}
-                        <div class="col">
-                            <div class="form-check">
-                                <input type="checkbox" name="{{ option.name }}" value="{{ option.value }}" 
-                                       class="form-check-input permission-checkbox" 
-                                       id="{{ option.attrs.id }}"
-                                       data-action="{{ option.attrs.data_action }}"
-                                       {% if option.selected %}checked{% endif %}>
-                                <label class="form-check-label" for="{{ option.attrs.id }}">
-                                    {{ option.label }}
-                                </label>
+            <!-- Body contains models and permissions -->
+            <div id="collapse_{{ app_label }}" class="collapse">
+                <div class="permissions-card-body">
+                    <div class="row g-3">
+                        {% for model_name, model_data in app_data.models.items %}
+                        <div class="col-md-6 col-lg-4">
+                            <div class="model-group">
+                                <div class="model-header">
+                                    <div class="form-check me-2">
+                                        <input class="form-check-input model-master-checkbox" type="checkbox" id="master_{{ app_label }}_{{ model_name }}">
+                                        <label class="form-check-label d-none" for="master_{{ app_label }}_{{ model_name }}">تحديد الكل</label>
+                                    </div>
+                                    <h6 class="model-title">{{ model_data.name }}</h6>
+                                </div>
+                                <div class="model-permissions">
+                                    {% for option in model_data.permissions %}
+                                    <div class="permission-item">
+                                        <div class="form-check">
+                                            <input type="checkbox" name="{{ option.name }}" value="{{ option.value }}" 
+                                                   class="form-check-input permission-checkbox" 
+                                                   id="{{ option.attrs.id }}"
+                                                   data-action="{{ option.attrs.data_action }}"
+                                                   data-model="{{ option.attrs.data_model }}"
+                                                   {% if option.selected %}checked{% endif %}>
+                                            <label class="form-check-label small" for="{{ option.attrs.id }}">
+                                                {{ option.label }}
+                                            </label>
+                                        </div>
+                                    </div>
+                                    {% endfor %}
+                                </div>
                             </div>
                         </div>
                         {% endfor %}
                     </div>
                 </div>
-                {% endfor %}
             </div>
         </div>
         {% endfor %}
     </div>
 </div>
 
-<script>
-document.addEventListener('DOMContentLoaded', function() {
-    const container = document.getElementById('{{ id }}_container');
-    console.log('Grouped Permissions Widget Initialized');
-    
-    // --- Helper Functions ---
-
-    // Update a specific App-level Master checkbox (e.g. Users->View All)
-    function updateAppGroupMaster(groupContainer) {
-        if (!groupContainer) return;
-        
-        const parentGroupDiv = groupContainer.closest('.permission-group');
-        if (!parentGroupDiv) return;
-
-        const masterCb = parentGroupDiv.querySelector('.group-checkbox');
-        if (masterCb) {
-            const allChildren = groupContainer.querySelectorAll('.permission-checkbox');
-            const total = allChildren.length;
-            let checkedCount = 0;
-            for (let i = 0; i < total; i++) {
-                if (allChildren[i].checked) checkedCount++;
-            }
-
-            masterCb.checked = (total > 0 && checkedCount === total);
-            masterCb.indeterminate = (checkedCount > 0 && checkedCount < total);
-        }
-    }
-
-    // Update ALL App-level Masters (useful after a global bulk change)
-    function updateAllAppMasters() {
-        const allGroupContainers = container.querySelectorAll('div[class*="_group"]');
-        allGroupContainers.forEach(groupContainer => {
-            updateAppGroupMaster(groupContainer);
-        });
-    }
-
-    // Update Global Masters (Top Bar)
-    function updateGlobalMasters() {
-        const globalSelectors = container.querySelectorAll('.global-select');
-        globalSelectors.forEach(globalCb => {
-            const actionTarget = globalCb.getAttribute('data-action-target');
-            const allTargets = container.querySelectorAll(`.permission-checkbox[data-action="${actionTarget}"]`);
-            
-            if (allTargets.length > 0) {
-                 const total = allTargets.length;
-                 let checkedCount = 0;
-                 for (let i = 0; i < total; i++) {
-                     if (allTargets[i].checked) checkedCount++;
-                 }
-
-                 globalCb.checked = (checkedCount === total);
-                 globalCb.indeterminate = (checkedCount > 0 && checkedCount < total);
-            }
-        });
-    }
-
-    // --- Global Selectors (Top Bar) Logic ---
-    const globalSelectors = container.querySelectorAll('.global-select');
-    globalSelectors.forEach(globalCb => {
-        globalCb.addEventListener('change', function() {
-            try {
-                const actionTarget = this.getAttribute('data-action-target');
-                const isChecked = this.checked;
-                console.log('Global Click:', actionTarget, isChecked);
-                
-                // 1. Bulk update all target children directly (No event dispatch)
-                const targetCheckboxes = container.querySelectorAll(`.permission-checkbox[data-action="${actionTarget}"]`);
-                targetCheckboxes.forEach(cb => {
-                    cb.checked = isChecked;
-                });
-
-                // 2. Update all App-level masters to reflect the change
-                updateAllAppMasters();
-                
-            } catch (e) {
-                console.error('Error in Global Select:', e);
-            }
-        });
-    });
-
-    // --- Sub-Group Masters (App Level) Logic ---
-    const groupCheckboxes = container.querySelectorAll('.group-checkbox');
-    groupCheckboxes.forEach(cb => {
-        cb.addEventListener('change', function() {
-            try {
-                const isChecked = this.checked;
-                const permissionGroup = this.closest('.permission-group');
-                if (!permissionGroup) return;
-
-                const targetGroup = permissionGroup.querySelector('div[class*="_group"]');
-                if (targetGroup) {
-                    // 1. Bulk update children directly
-                    const childCheckboxes = targetGroup.querySelectorAll('.permission-checkbox');
-                    childCheckboxes.forEach(child => {
-                        child.checked = isChecked;
-                    });
-                    
-                    // 2. Update Global Masters since the counts changed
-                    updateGlobalMasters();
-                }
-            } catch (e) {
-                console.error('Error in SubGroup Select:', e);
-            }
-        });
-    });
-
-    // --- Individual Permission Logic ---
-    const permissionCheckboxes = container.querySelectorAll('.permission-checkbox');
-    permissionCheckboxes.forEach(cb => {
-        cb.addEventListener('change', function() {
-            // Update the specific App Group Master this belongs to
-            const groupContainer = this.closest('div[class*="_group"]');
-            updateAppGroupMaster(groupContainer);
-            
-            // Update Global Masters
-            updateGlobalMasters();
-        });
-    });
-
-    // --- Initial State Hydration ---
-    updateAllAppMasters();
-    updateGlobalMasters();
-});
-</script>
+<script src="{% static 'users/js/permissions.js' %}"></script>
 {% endwith %}

users/views.py

@@ -126,7 +126,8 @@ def edit_user(request, pk):
     
     # 🚫 Block staff users from editing superuser accounts
     if user.is_superuser and not request.user.is_superuser:
-        messages.error(request, "لا يمكن تعديل هذا الحساب!")
+        messages.error(request, "ليس لديك صلاحية لتعديل هذا الحساب!")
+        return redirect('manage_users')
 
 
     # Restrict to same scope
@@ -235,6 +236,11 @@ class UserDetailView(LoginRequiredMixin, UserPassesTestMixin, DetailView):
 def reset_password(request, pk):
     user = get_object_or_404(User, id=pk)
 
+    # 🚫 Block staff users from resetting superuser passwords
+    if user.is_superuser and not request.user.is_superuser:
+        messages.error(request, "ليس لديك صلاحية لتعديل هذا الحساب!")
+        return redirect('manage_users')
+
     # Restrict to same scope
     if not request.user.is_superuser:
         if request.user.scope and user.scope != request.user.scope:

users/static/users/js/anime.min.js

@@ -1,8 +0,0 @@
-/*
- * anime.js v3.0.1
- * (c) 2019 Julian Garnier
- * Released under the MIT license
- * animejs.com
- */
-
-!function(n,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):n.anime=e()}(this,function(){"use strict";var n={update:null,begin:null,loopBegin:null,changeBegin:null,change:null,changeComplete:null,loopComplete:null,complete:null,loop:1,direction:"normal",autoplay:!0,timelineOffset:0},e={duration:1e3,delay:0,endDelay:0,easing:"easeOutElastic(1, .5)",round:0},r=["translateX","translateY","translateZ","rotate","rotateX","rotateY","rotateZ","scale","scaleX","scaleY","scaleZ","skew","skewX","skewY","perspective"],t={CSS:{},springs:{}};function a(n,e,r){return Math.min(Math.max(n,e),r)}function o(n,e){return n.indexOf(e)>-1}function i(n,e){return n.apply(null,e)}var u={arr:function(n){return Array.isArray(n)},obj:function(n){return o(Object.prototype.toString.call(n),"Object")},pth:function(n){return u.obj(n)&&n.hasOwnProperty("totalLength")},svg:function(n){return n instanceof SVGElement},inp:function(n){return n instanceof HTMLInputElement},dom:function(n){return n.nodeType||u.svg(n)},str:function(n){return"string"==typeof n},fnc:function(n){return"function"==typeof n},und:function(n){return void 0===n},hex:function(n){return/(^#[0-9A-F]{6}$)|(^#[0-9A-F]{3}$)/i.test(n)},rgb:function(n){return/^rgb/.test(n)},hsl:function(n){return/^hsl/.test(n)},col:function(n){return u.hex(n)||u.rgb(n)||u.hsl(n)},key:function(r){return!n.hasOwnProperty(r)&&!e.hasOwnProperty(r)&&"targets"!==r&&"keyframes"!==r}};function s(n){var e=/\(([^)]+)\)/.exec(n);return e?e[1].split(",").map(function(n){return parseFloat(n)}):[]}function c(n,e){var r=s(n),o=a(u.und(r[0])?1:r[0],.1,100),i=a(u.und(r[1])?100:r[1],.1,100),c=a(u.und(r[2])?10:r[2],.1,100),f=a(u.und(r[3])?0:r[3],.1,100),l=Math.sqrt(i/o),d=c/(2*Math.sqrt(i*o)),p=d<1?l*Math.sqrt(1-d*d):0,v=1,h=d<1?(d*l-f)/p:-f+l;function g(n){var r=e?e*n/1e3:n;return r=d<1?Math.exp(-r*d*l)*(v*Math.cos(p*r)+h*Math.sin(p*r)):(v+h*r)*Math.exp(-r*l),0===n||1===n?n:1-r}return e?g:function(){var e=t.springs[n];if(e)return e;for(var r=0,a=0;;)if(1===g(r+=1/6)){if(++a>=16)break}else a=0;var o=r*(1/6)*1e3;return t.springs[n]=o,o}}function f(n,e){void 0===n&&(n=1),void 0===e&&(e=.5);var r=a(n,1,10),t=a(e,.1,2);return function(n){return 0===n||1===n?n:-r*Math.pow(2,10*(n-1))*Math.sin((n-1-t/(2*Math.PI)*Math.asin(1/r))*(2*Math.PI)/t)}}function l(n){return void 0===n&&(n=10),function(e){return Math.round(e*n)*(1/n)}}var d=function(){var n=11,e=1/(n-1);function r(n,e){return 1-3*e+3*n}function t(n,e){return 3*e-6*n}function a(n){return 3*n}function o(n,e,o){return((r(e,o)*n+t(e,o))*n+a(e))*n}function i(n,e,o){return 3*r(e,o)*n*n+2*t(e,o)*n+a(e)}return function(r,t,a,u){if(0<=r&&r<=1&&0<=a&&a<=1){var s=new Float32Array(n);if(r!==t||a!==u)for(var c=0;c<n;++c)s[c]=o(c*e,r,a);return function(n){return r===t&&a===u?n:0===n||1===n?n:o(f(n),t,u)}}function f(t){for(var u=0,c=1,f=n-1;c!==f&&s[c]<=t;++c)u+=e;var l=u+(t-s[--c])/(s[c+1]-s[c])*e,d=i(l,r,a);return d>=.001?function(n,e,r,t){for(var a=0;a<4;++a){var u=i(e,r,t);if(0===u)return e;e-=(o(e,r,t)-n)/u}return e}(t,l,r,a):0===d?l:function(n,e,r,t,a){for(var i,u,s=0;(i=o(u=e+(r-e)/2,t,a)-n)>0?r=u:e=u,Math.abs(i)>1e-7&&++s<10;);return u}(t,u,u+e,r,a)}}}(),p=function(){var n=["Quad","Cubic","Quart","Quint","Sine","Expo","Circ","Back","Elastic"],e={In:[[.55,.085,.68,.53],[.55,.055,.675,.19],[.895,.03,.685,.22],[.755,.05,.855,.06],[.47,0,.745,.715],[.95,.05,.795,.035],[.6,.04,.98,.335],[.6,-.28,.735,.045],f],Out:[[.25,.46,.45,.94],[.215,.61,.355,1],[.165,.84,.44,1],[.23,1,.32,1],[.39,.575,.565,1],[.19,1,.22,1],[.075,.82,.165,1],[.175,.885,.32,1.275],function(n,e){return function(r){return 1-f(n,e)(1-r)}}],InOut:[[.455,.03,.515,.955],[.645,.045,.355,1],[.77,0,.175,1],[.86,0,.07,1],[.445,.05,.55,.95],[1,0,0,1],[.785,.135,.15,.86],[.68,-.55,.265,1.55],function(n,e){return function(r){return r<.5?f(n,e)(2*r)/2:1-f(n,e)(-2*r+2)/2}}]},r={linear:[.25,.25,.75,.75]},t=function(t){e[t].forEach(function(e,a){r["ease"+t+n[a]]=e})};for(var a in e)t(a);return r}();function v(n,e){if(u.fnc(n))return n;var r=n.split("(")[0],t=p[r],a=s(n);switch(r){case"spring":return c(n,e);case"cubicBezier":return i(d,a);case"steps":return i(l,a);default:return u.fnc(t)?i(t,a):i(d,t)}}function h(n){try{return document.querySelectorAll(n)}catch(n){return}}function g(n,e){for(var r=n.length,t=arguments.length>=2?arguments[1]:void 0,a=[],o=0;o<r;o++)if(o in n){var i=n[o];e.call(t,i,o,n)&&a.push(i)}return a}function m(n){return n.reduce(function(n,e){return n.concat(u.arr(e)?m(e):e)},[])}function y(n){return u.arr(n)?n:(u.str(n)&&(n=h(n)||n),n instanceof NodeList||n instanceof HTMLCollection?[].slice.call(n):[n])}function b(n,e){return n.some(function(n){return n===e})}function x(n){var e={};for(var r in n)e[r]=n[r];return e}function M(n,e){var r=x(n);for(var t in n)r[t]=e.hasOwnProperty(t)?e[t]:n[t];return r}function w(n,e){var r=x(n);for(var t in e)r[t]=u.und(n[t])?e[t]:n[t];return r}function k(n){return u.rgb(n)?(r=/rgb\((\d+,\s*[\d]+,\s*[\d]+)\)/g.exec(e=n))?"rgba("+r[1]+",1)":e:u.hex(n)?(t=n.replace(/^#?([a-f\d])([a-f\d])([a-f\d])$/i,function(n,e,r,t){return e+e+r+r+t+t}),a=/^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(t),"rgba("+parseInt(a[1],16)+","+parseInt(a[2],16)+","+parseInt(a[3],16)+",1)"):u.hsl(n)?function(n){var e,r,t,a=/hsl\((\d+),\s*([\d.]+)%,\s*([\d.]+)%\)/g.exec(n)||/hsla\((\d+),\s*([\d.]+)%,\s*([\d.]+)%,\s*([\d.]+)\)/g.exec(n),o=parseInt(a[1],10)/360,i=parseInt(a[2],10)/100,u=parseInt(a[3],10)/100,s=a[4]||1;function c(n,e,r){return r<0&&(r+=1),r>1&&(r-=1),r<1/6?n+6*(e-n)*r:r<.5?e:r<2/3?n+(e-n)*(2/3-r)*6:n}if(0==i)e=r=t=u;else{var f=u<.5?u*(1+i):u+i-u*i,l=2*u-f;e=c(l,f,o+1/3),r=c(l,f,o),t=c(l,f,o-1/3)}return"rgba("+255*e+","+255*r+","+255*t+","+s+")"}(n):void 0;var e,r,t,a}function C(n){var e=/([\+\-]?[0-9#\.]+)(%|px|pt|em|rem|in|cm|mm|ex|ch|pc|vw|vh|vmin|vmax|deg|rad|turn)?$/.exec(n);if(e)return e[2]}function O(n,e){return u.fnc(n)?n(e.target,e.id,e.total):n}function P(n,e){return n.getAttribute(e)}function I(n,e,r){if(b([r,"deg","rad","turn"],C(e)))return e;var a=t.CSS[e+r];if(!u.und(a))return a;var o=document.createElement(n.tagName),i=n.parentNode&&n.parentNode!==document?n.parentNode:document.body;i.appendChild(o),o.style.position="absolute",o.style.width=100+r;var s=100/o.offsetWidth;i.removeChild(o);var c=s*parseFloat(e);return t.CSS[e+r]=c,c}function B(n,e,r){if(e in n.style){var t=e.replace(/([a-z])([A-Z])/g,"$1-$2").toLowerCase(),a=n.style[e]||getComputedStyle(n).getPropertyValue(t)||"0";return r?I(n,a,r):a}}function D(n,e){return u.dom(n)&&!u.inp(n)&&(P(n,e)||u.svg(n)&&n[e])?"attribute":u.dom(n)&&b(r,e)?"transform":u.dom(n)&&"transform"!==e&&B(n,e)?"css":null!=n[e]?"object":void 0}function T(n){if(u.dom(n)){for(var e,r=n.style.transform||"",t=/(\w+)\(([^)]*)\)/g,a=new Map;e=t.exec(r);)a.set(e[1],e[2]);return a}}function F(n,e,r,t){var a,i=o(e,"scale")?1:0+(o(a=e,"translate")||"perspective"===a?"px":o(a,"rotate")||o(a,"skew")?"deg":void 0),u=T(n).get(e)||i;return r&&(r.transforms.list.set(e,u),r.transforms.last=e),t?I(n,u,t):u}function N(n,e,r,t){switch(D(n,e)){case"transform":return F(n,e,t,r);case"css":return B(n,e,r);case"attribute":return P(n,e);default:return n[e]||0}}function A(n,e){var r=/^(\*=|\+=|-=)/.exec(n);if(!r)return n;var t=C(n)||0,a=parseFloat(e),o=parseFloat(n.replace(r[0],""));switch(r[0][0]){case"+":return a+o+t;case"-":return a-o+t;case"*":return a*o+t}}function E(n,e){if(u.col(n))return k(n);var r=C(n),t=r?n.substr(0,n.length-r.length):n;return e&&!/\s/g.test(n)?t+e:t}function L(n,e){return Math.sqrt(Math.pow(e.x-n.x,2)+Math.pow(e.y-n.y,2))}function S(n){for(var e,r=n.points,t=0,a=0;a<r.numberOfItems;a++){var o=r.getItem(a);a>0&&(t+=L(e,o)),e=o}return t}function j(n){if(n.getTotalLength)return n.getTotalLength();switch(n.tagName.toLowerCase()){case"circle":return o=n,2*Math.PI*P(o,"r");case"rect":return 2*P(a=n,"width")+2*P(a,"height");case"line":return L({x:P(t=n,"x1"),y:P(t,"y1")},{x:P(t,"x2"),y:P(t,"y2")});case"polyline":return S(n);case"polygon":return r=(e=n).points,S(e)+L(r.getItem(r.numberOfItems-1),r.getItem(0))}var e,r,t,a,o}function q(n,e){var r=e||{},t=r.el||function(n){for(var e=n.parentNode;u.svg(e)&&(e=e.parentNode,u.svg(e.parentNode)););return e}(n),a=t.getBoundingClientRect(),o=P(t,"viewBox"),i=a.width,s=a.height,c=r.viewBox||(o?o.split(" "):[0,0,i,s]);return{el:t,viewBox:c,x:c[0]/1,y:c[1]/1,w:i/c[2],h:s/c[3]}}function $(n,e){function r(r){void 0===r&&(r=0);var t=e+r>=1?e+r:0;return n.el.getPointAtLength(t)}var t=q(n.el,n.svg),a=r(),o=r(-1),i=r(1);switch(n.property){case"x":return(a.x-t.x)*t.w;case"y":return(a.y-t.y)*t.h;case"angle":return 180*Math.atan2(i.y-o.y,i.x-o.x)/Math.PI}}function X(n,e){var r=/-?\d*\.?\d+/g,t=E(u.pth(n)?n.totalLength:n,e)+"";return{original:t,numbers:t.match(r)?t.match(r).map(Number):[0],strings:u.str(n)||e?t.split(r):[]}}function Y(n){return g(n?m(u.arr(n)?n.map(y):y(n)):[],function(n,e,r){return r.indexOf(n)===e})}function Z(n){var e=Y(n);return e.map(function(n,r){return{target:n,id:r,total:e.length,transforms:{list:T(n)}}})}function Q(n,e){var r=x(e);if(/^spring/.test(r.easing)&&(r.duration=c(r.easing)),u.arr(n)){var t=n.length;2===t&&!u.obj(n[0])?n={value:n}:u.fnc(e.duration)||(r.duration=e.duration/t)}var a=u.arr(n)?n:[n];return a.map(function(n,r){var t=u.obj(n)&&!u.pth(n)?n:{value:n};return u.und(t.delay)&&(t.delay=r?0:e.delay),u.und(t.endDelay)&&(t.endDelay=r===a.length-1?e.endDelay:0),t}).map(function(n){return w(n,r)})}function V(n,e){var r=[],t=e.keyframes;for(var a in t&&(e=w(function(n){for(var e=g(m(n.map(function(n){return Object.keys(n)})),function(n){return u.key(n)}).reduce(function(n,e){return n.indexOf(e)<0&&n.push(e),n},[]),r={},t=function(t){var a=e[t];r[a]=n.map(function(n){var e={};for(var r in n)u.key(r)?r==a&&(e.value=n[r]):e[r]=n[r];return e})},a=0;a<e.length;a++)t(a);return r}(t),e)),e)u.key(a)&&r.push({name:a,tweens:Q(e[a],n)});return r}function z(n,e){var r;return n.tweens.map(function(t){var a=function(n,e){var r={};for(var t in n){var a=O(n[t],e);u.arr(a)&&1===(a=a.map(function(n){return O(n,e)})).length&&(a=a[0]),r[t]=a}return r.duration=parseFloat(r.duration),r.delay=parseFloat(r.delay),r}(t,e),o=a.value,i=u.arr(o)?o[1]:o,s=C(i),c=N(e.target,n.name,s,e),f=r?r.to.original:c,l=u.arr(o)?o[0]:f,d=C(l)||C(c),p=s||d;return u.und(i)&&(i=f),a.from=X(l,p),a.to=X(A(i,l),p),a.start=r?r.end:0,a.end=a.start+a.delay+a.duration+a.endDelay,a.easing=v(a.easing,a.duration),a.isPath=u.pth(o),a.isColor=u.col(a.from.original),a.isColor&&(a.round=1),r=a,a})}var H={css:function(n,e,r){return n.style[e]=r},attribute:function(n,e,r){return n.setAttribute(e,r)},object:function(n,e,r){return n[e]=r},transform:function(n,e,r,t,a){if(t.list.set(e,r),e===t.last||a){var o="";t.list.forEach(function(n,e){o+=e+"("+n+") "}),n.style.transform=o}}};function G(n,e){Z(n).forEach(function(n){for(var r in e){var t=O(e[r],n),a=n.target,o=C(t),i=N(a,r,o,n),u=A(E(t,o||C(i)),i),s=D(a,r);H[s](a,r,u,n.transforms,!0)}})}function R(n,e){return g(m(n.map(function(n){return e.map(function(e){return function(n,e){var r=D(n.target,e.name);if(r){var t=z(e,n),a=t[t.length-1];return{type:r,property:e.name,animatable:n,tweens:t,duration:a.end,delay:t[0].delay,endDelay:a.endDelay}}}(n,e)})})),function(n){return!u.und(n)})}function W(n,e){var r=n.length,t=function(n){return n.timelineOffset?n.timelineOffset:0},a={};return a.duration=r?Math.max.apply(Math,n.map(function(n){return t(n)+n.duration})):e.duration,a.delay=r?Math.min.apply(Math,n.map(function(n){return t(n)+n.delay})):e.delay,a.endDelay=r?a.duration-Math.max.apply(Math,n.map(function(n){return t(n)+n.duration-n.endDelay})):e.endDelay,a}var J=0;var K,U=[],_=[],nn=function(){function n(){K=requestAnimationFrame(e)}function e(e){var r=U.length;if(r){for(var t=0;t<r;){var a=U[t];if(a.paused){var o=U.indexOf(a);o>-1&&(U.splice(o,1),r=U.length)}else a.tick(e);t++}n()}else K=cancelAnimationFrame(K)}return n}();function en(r){void 0===r&&(r={});var t,o=0,i=0,u=0,s=0,c=null;function f(n){var e=window.Promise&&new Promise(function(n){return c=n});return n.finished=e,e}var l,d,p,v,h,m,y,b,x=(d=M(n,l=r),p=M(e,l),v=V(p,l),h=Z(l.targets),m=R(h,v),y=W(m,p),b=J,J++,w(d,{id:b,children:[],animatables:h,animations:m,duration:y.duration,delay:y.delay,endDelay:y.endDelay}));f(x);function k(){var n=x.direction;"alternate"!==n&&(x.direction="normal"!==n?"normal":"reverse"),x.reversed=!x.reversed,t.forEach(function(n){return n.reversed=x.reversed})}function C(n){return x.reversed?x.duration-n:n}function O(){o=0,i=C(x.currentTime)*(1/en.speed)}function P(n,e){e&&e.seek(n-e.timelineOffset)}function I(n){for(var e=0,r=x.animations,t=r.length;e<t;){var o=r[e],i=o.animatable,u=o.tweens,s=u.length-1,c=u[s];s&&(c=g(u,function(e){return n<e.end})[0]||c);for(var f=a(n-c.start-c.delay,0,c.duration)/c.duration,l=isNaN(f)?1:c.easing(f),d=c.to.strings,p=c.round,v=[],h=c.to.numbers.length,m=void 0,y=0;y<h;y++){var b=void 0,M=c.to.numbers[y],w=c.from.numbers[y]||0;b=c.isPath?$(c.value,l*M):w+l*(M-w),p&&(c.isColor&&y>2||(b=Math.round(b*p)/p)),v.push(b)}var k=d.length;if(k){m=d[0];for(var C=0;C<k;C++){d[C];var O=d[C+1],P=v[C];isNaN(P)||(m+=O?P+O:P+" ")}}else m=v[0];H[o.type](i.target,o.property,m,i.transforms),o.currentValue=m,e++}}function B(n){x[n]&&!x.passThrough&&x[n](x)}function D(n){var e=x.duration,r=x.delay,l=e-x.endDelay,d=C(n);x.progress=a(d/e*100,0,100),x.reversePlayback=d<x.currentTime,t&&function(n){if(x.reversePlayback)for(var e=s;e--;)P(n,t[e]);else for(var r=0;r<s;r++)P(n,t[r])}(d),!x.began&&x.currentTime>0&&(x.began=!0,B("begin"),B("loopBegin")),d<=r&&0!==x.currentTime&&I(0),(d>=l&&x.currentTime!==e||!e)&&I(e),d>r&&d<l?(x.changeBegan||(x.changeBegan=!0,x.changeCompleted=!1,B("changeBegin")),B("change"),I(d)):x.changeBegan&&(x.changeCompleted=!0,x.changeBegan=!1,B("changeComplete")),x.currentTime=a(d,0,e),x.began&&B("update"),n>=e&&(i=0,x.remaining&&!0!==x.remaining&&x.remaining--,x.remaining?(o=u,B("loopComplete"),B("loopBegin"),"alternate"===x.direction&&k()):(x.paused=!0,x.completed||(x.completed=!0,B("loopComplete"),B("complete"),!x.passThrough&&"Promise"in window&&(c(),f(x)))))}return x.reset=function(){var n=x.direction;x.passThrough=!1,x.currentTime=0,x.progress=0,x.paused=!0,x.began=!1,x.changeBegan=!1,x.completed=!1,x.changeCompleted=!1,x.reversePlayback=!1,x.reversed="reverse"===n,x.remaining=x.loop,t=x.children;for(var e=s=t.length;e--;)x.children[e].reset();(x.reversed&&!0!==x.loop||"alternate"===n&&1===x.loop)&&x.remaining++,I(0)},x.set=function(n,e){return G(n,e),x},x.tick=function(n){u=n,o||(o=u),D((u+(i-o))*en.speed)},x.seek=function(n){D(C(n))},x.pause=function(){x.paused=!0,O()},x.play=function(){x.paused&&(x.completed&&x.reset(),x.paused=!1,U.push(x),O(),K||nn())},x.reverse=function(){k(),O()},x.restart=function(){x.reset(),x.play()},x.reset(),x.autoplay&&x.play(),x}function rn(n,e){for(var r=e.length;r--;)b(n,e[r].animatable.target)&&e.splice(r,1)}return"undefined"!=typeof document&&document.addEventListener("visibilitychange",function(){document.hidden?(U.forEach(function(n){return n.pause()}),_=U.slice(0),U=[]):_.forEach(function(n){return n.play()})}),en.version="3.0.1",en.speed=1,en.running=U,en.remove=function(n){for(var e=Y(n),r=U.length;r--;){var t=U[r],a=t.animations,o=t.children;rn(e,a);for(var i=o.length;i--;){var u=o[i],s=u.animations;rn(e,s),s.length||u.children.length||o.splice(i,1)}a.length||o.length||t.pause()}},en.get=N,en.set=G,en.convertPx=I,en.path=function(n,e){var r=u.str(n)?h(n)[0]:n,t=e||100;return function(n){return{property:n,el:r,svg:q(r),totalLength:j(r)*(t/100)}}},en.setDashoffset=function(n){var e=j(n);return n.setAttribute("stroke-dasharray",e),e},en.stagger=function(n,e){void 0===e&&(e={});var r=e.direction||"normal",t=e.easing?v(e.easing):null,a=e.grid,o=e.axis,i=e.from||0,s="first"===i,c="center"===i,f="last"===i,l=u.arr(n),d=l?parseFloat(n[0]):parseFloat(n),p=l?parseFloat(n[1]):0,h=C(l?n[1]:n)||0,g=e.start||0+(l?d:0),m=[],y=0;return function(n,e,u){if(s&&(i=0),c&&(i=(u-1)/2),f&&(i=u-1),!m.length){for(var v=0;v<u;v++){if(a){var b=c?(a[0]-1)/2:i%a[0],x=c?(a[1]-1)/2:Math.floor(i/a[0]),M=b-v%a[0],w=x-Math.floor(v/a[0]),k=Math.sqrt(M*M+w*w);"x"===o&&(k=-M),"y"===o&&(k=-w),m.push(k)}else m.push(Math.abs(i-v));y=Math.max.apply(Math,m)}t&&(m=m.map(function(n){return t(n/y)*y})),"reverse"===r&&(m=m.map(function(n){return o?n<0?-1*n:-n:Math.abs(y-n)}))}return g+(l?(p-d)/y:d)*(Math.round(100*m[e])/100)+h}},en.timeline=function(n){void 0===n&&(n={});var r=en(n);return r.duration=0,r.add=function(t,a){var o=U.indexOf(r),i=r.children;function s(n){n.passThrough=!0}o>-1&&U.splice(o,1);for(var c=0;c<i.length;c++)s(i[c]);var f=w(t,M(e,n));f.targets=f.targets||n.targets;var l=r.duration;f.autoplay=!1,f.direction=r.direction,f.timelineOffset=u.und(a)?l:A(a,l),s(r),r.seek(f.timelineOffset);var d=en(f);s(d),i.push(d);var p=W(i,n);return r.delay=p.delay,r.endDelay=p.endDelay,r.duration=p.duration,r.seek(0),r.reset(),r.autoplay&&r.play(),r},r},en.easing=v,en.penner=p,en.random=function(n,e){return Math.floor(Math.random()*(e-n+1))+n},en});