micro-users 1.2.0__py3-none-any.whl → 1.2.3__py3-none-any.whl

{micro_users-1.2.0.dist-info → micro_users-1.2.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: micro-users
-Version: 1.2.0
+Version: 1.2.3
 Summary: Arabic Django user management app with abstract user, permissions, and activity logging
 Home-page: https://github.com/debeski/micro-users
 Author: DeBeski
@@ -51,6 +51,7 @@ Requires-Dist: babel (>=2.1)
 - Custom AbstractUser model
 - User permissions system  
 - Activity logging (login/logout, CRUD tracking)
+- Specific User detail and log view *new*
 - Localization support
 - Admin interface integration
 - CRUD views and templates
@@ -109,12 +110,14 @@ users/
 ## Version History
 
 | Version  | Changes |
-| v1.0.0   | Initial release as pip package |
-| v1.0.1   | Fixed a couple of new issues as a pip package |
-| v1.0.2   | Fixed the readme and building files |
-| v1.0.3   | Still getting the hang of this pip publish thing |
-| v1.0.4   | Honestly still messing with and trying settings and stuff out |
-| v1.1.0   | OK, finally a working seamless micro-users app |
-| v1.1.1   | Fixed a bug where a staff member can edit the admin details |
-| v1.2.0   | Added User Details view with specific user activity log |
-| v
+|----------|---------|
+| v1.0.0   | • Initial release as pip package |
+| v1.0.1   | • Fixed a couple of new issues as a pip package |
+| v1.0.2   | • Fixed the readme and building files |
+| v1.0.3   | • Still getting the hang of this pip publish thing |
+| v1.0.4   | • Honestly still messing with and trying settings and stuff out |
+| v1.1.0   | • OK, finally a working seamless micro-users app |
+| v1.1.1   | • Fixed a bug where a staff member can edit the admin details |
+| v1.2.0   | • Added User Details view with specific user activity log |
+| v1.2.1   | • Fixed a minor import bug |
+| v1.2.3   | • Separated user detail view from table for consistency<br> • Optimized the new detail + log view for optimal compatibiliyy with users |

{micro_users-1.2.0.dist-info → micro_users-1.2.3.dist-info}/RECORD

@@ -7,19 +7,21 @@ users/models.py,sha256=KX_6LoiNJN6PCTFOuuGp5so4CNn5pAh1Vpaigv4fKk4,2060
 users/signals.py,sha256=5Kd3KyfPT6740rvwZj4vy1yXsmjVhmaQ__RB8p5R5aE,1336
 users/tables.py,sha256=ZW8_TR6Y3DwchS7Q8DGVdJX01fjIDZfaqoZo0XpZnyU,1920
 users/urls.py,sha256=FwQ9GVOBRQ4iXQ9UyLFI0aEAga0d5qL_miPNpmFPA-Q,1022
-users/views.py,sha256=HOl3pHr3M28s3pHkyGjCgRbiOwqSSRkbkazzpcMBofw,8074
+users/views.py,sha256=FdMY49IKgU0clowCJ3_XRqqLLja7N7fs9GhavmJE0mw,7979
 users/migrations/0001_initial.py,sha256=lx9sSKS-lxHhI6gelVH52NOkwqEMJ32TvOJUn9zaOXM,4709
 users/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+users/static/css/login.css,sha256=SiJ6jBbWQAP2Nxt7DOTZbTcFYP9JEp557AuQZ9Eirb0,2120
+users/static/img/default_profile.webp,sha256=BKUoQHo4z_fZnmc6z6I-KFvLEHahDr98U9LnDQKHLAM,3018
 users/templates/user_activity_log.html,sha256=S_FDN6vVLz_mB826yjeU9vtVGtzk7E_LKBmQIeYtdkQ,611
 users/templates/registration/login.html,sha256=owbzO_XjqMeSncwWxkTzsvbkhjEZd7LdbblC3HBnld0,4091
 users/templates/users/manage_users.html,sha256=ZusUTrJcp-xeORBnOcBObi9q1zlQE9yVRurMEvQVeWQ,2940
 users/templates/users/profile.html,sha256=9ahVF6YZUR-6-c8SKc0rN2pVdis2lI9gbcOQZeMaFnY,2909
 users/templates/users/profile_edit.html,sha256=sgO3h9ffVK1vnDNl4E6l5x3xfam3FTQl6Lqkrw5gmlw,4215
-users/templates/users/user_actions.html,sha256=oJedI5NElf-bXFBdeuQVNgx2enbwRsJSowBv5i6PFUE,1625
-users/templates/users/user_detail.html,sha256=jU6GIKlXEwnASDL_yosc6V46SjSwIDAgaRn0_iDK50U,1688
+users/templates/users/user_actions.html,sha256=TfA1DUvPyuSTPvVn7JgAL1cbqQyT9d8vnVB6j6308LU,1625
+users/templates/users/user_detail.html,sha256=QkJ-6jdtUdi8mM-V_MzqYcdoEkzXEsIeFMliNjgIOsc,2053
 users/templates/users/user_form.html,sha256=jcyI7OQZOY4ue4DajPtfjAt2SmAYO5ZgHNOqTp2-FO0,1352
-micro_users-1.2.0.dist-info/LICENSE,sha256=Fco89ULLSSxKkC2KKnx57SaT0R7WOkZfuk8IYcGiN50,1063
-micro_users-1.2.0.dist-info/METADATA,sha256=FjI3CzRhLRwETEGtpsxs56AN3M5KSAXbI9EMrvY5ho0,3362
-micro_users-1.2.0.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-micro_users-1.2.0.dist-info/top_level.txt,sha256=tWT24ZcWau2wrlbpU_h3mP2jRukyLaVYiyHBuOezpLQ,6
-micro_users-1.2.0.dist-info/RECORD,,
+micro_users-1.2.3.dist-info/LICENSE,sha256=Fco89ULLSSxKkC2KKnx57SaT0R7WOkZfuk8IYcGiN50,1063
+micro_users-1.2.3.dist-info/METADATA,sha256=dApOQwELdXHFYZaiDIPqzK6uuz24dN9R3RjriOEqRtQ,3653
+micro_users-1.2.3.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+micro_users-1.2.3.dist-info/top_level.txt,sha256=tWT24ZcWau2wrlbpU_h3mP2jRukyLaVYiyHBuOezpLQ,6
+micro_users-1.2.3.dist-info/RECORD,,

users/static/css/login.css

@@ -0,0 +1,134 @@
+::selection {
+  background: #d4c591;
+}
+::-webkit-selection {
+  background: #d4c591;
+}
+::-moz-selection {
+  background: #c9aa5e;
+}
+
+.page {
+  display: flex;
+  flex-direction: column;
+  height: calc(100% - 15vh);
+  position: absolute;
+  place-content: center;
+  width: calc(100% - 40px);
+}
+@media (max-width: 767px) {
+  .page {
+    height: auto;
+    margin-bottom: 20px;
+    padding-bottom: 20px;
+  }
+}
+.container {
+  height: 320px;
+  margin: 0 auto;
+  width: 640px;
+}
+@media (max-width: 767px) {
+  .container {
+    flex-direction: column;
+    height: 630px;
+    width: 320px;
+  }
+}
+.left {
+  background: white;
+  height: calc(100% - 40px);
+  top: 20px;
+  position: relative;
+  width: 60%;
+  box-shadow: 0px 0px 10px 4px rgba(0,0,0,0.03);
+
+}
+@media (max-width: 767px) {
+  .left {
+    height: 100%;
+    left: 5%;
+    width: 110%;
+    max-height: 270px;
+  }
+}
+/* .login {
+  font-size: 38px;
+  font-weight: 600;
+}
+.eula {
+  color: #adadad;
+  font-size: 14px;
+  line-height: 1.5;
+  margin: 40px;
+} */
+.right {
+  background: #cb9447;
+  box-shadow: 0px 0px 20px 8px rgba(0,0,0,0.07);
+  color: #F1F1F2;
+  position: relative;
+  width: 58%;
+}
+@media (max-width: 767px) {
+  .right {
+    flex-shrink: 0;
+    height: 100%;
+    width: 100%;
+    max-height: 350px;
+  }
+}
+svg {
+  position: absolute;
+  width: 320px;
+}
+path {
+  fill: none;
+  stroke: url(#linearGradient);;
+  stroke-width: 3;
+  stroke-dasharray: 240 1386;
+}
+.form {
+  margin: 35px 35px 35px 20px;
+  position: absolute;
+}
+label {
+  color:  #c2c2c5;
+  display: block;
+  font-size: 14px;
+  height: 16px;
+  margin-top: 20px;
+  margin-bottom: 5px;
+}
+input {
+  background: transparent;
+  border: 0;
+  color: #2d0202;
+  font-size: 20px;
+  height: 30px;
+  line-height: 30px;
+  outline: none !important;
+  width: 100%;
+  margin-top: 30px;
+  margin-bottom: 10px;
+}
+input::-moz-focus-inner { 
+  border: 0; 
+}
+#submit {
+  color: #707075;
+  margin-top: 40px;
+  transition: color 300ms;
+}
+#submit:focus {
+  color: #575757;
+} 
+#submit:active {
+  color: #4d4d4d;
+}
+
+.titlebar {
+  background-color: var(--title);
+  flex-direction: row;
+  height: 7vh;
+  justify-content: center !important
+}

users/templates/users/user_actions.html

@@ -9,12 +9,12 @@
                     <i class="bi bi-person-lines-fill text-dark me-1 h5"> </i> عرض
                 </a>
             </li> {% endcomment %}
-            {% if not record.is_superuser %}
             <li>
                 <a class="dropdown-item" href="{% url 'user_detail' record.pk %}" title="عرض">
                     <i class="bi bi-person-dash-fill text-dark me-1 h5"> </i> عرض
                 </a>
             </li>
+            {% if not record.is_superuser %}
             <li>
                 <a class="dropdown-item" href="{% url 'edit_user' record.pk %}" title="تعديل">
                     <i class="bi bi-person-dash-fill text-dark me-1 h5"> </i> تعديل

users/templates/users/user_detail.html

@@ -1,49 +1,52 @@
 {% extends "base.html" %}
 {% load crispy_forms_tags %}
 {% load django_tables2 %}
+{% load static %}
 
 {% block content %}
-<div class="container mt-4">
-    <!-- USER INFO CARD -->
-    <div class="card mb-4 shadow-sm">
-        <div class="card-header bg-primary text-white">
-            تفاصيل المستخدم
-        </div>
-        <div class="card-body">
-            <h5>{{ detail_user.get_full_name }} ({{ detail_user.username }})</h5>
-            <p class="mb-1"><strong>البريد:</strong> {{ detail_user.email }}</p>
-            <p class="mb-1"><strong>تاريخ الإنشاء:</strong> {{ detail_user.date_joined|date:"Y-m-d" }}</p>
-            <p class="mb-1"><strong>آخر دخول:</strong> {{ detail_user.last_login|date:"Y-m-d H:i" }}</p>
-            <p class="mb-1"><strong>الصلاحيات:</strong>
-                {% if detail_user.is_superuser %}
-                    مدير النظام
-                {% elif detail_user.is_staff %}
-                    مستخدم اداري
-                {% else %}
-                    مستخدم عادي
-                {% endif %}
-            </p>
+    <div class="card border-light shadow">
+        <div class="card-header h3">تفاصيل المستخدم</div>
+        <div class="card-body mt-2 row">
+            <div class="col-md-6 h4">
+                <p><strong>اسم الـمستخدم:</strong> {{ object.username }}</p>
+                <p><strong>الاســــــــــــــــــم:</strong> {{ object.get_full_name }}</p>
+                <p><strong>رقـــــم الـــهاتف:</strong> {{ object.phone }}</p>
+                <p><strong>جهـــــة الـــعمل:</strong> {{ object.occupation }}</p>
+            </div>
+            <div class="col-md-6 h4">
+                <p><strong>البريد الالكتروني:</strong> {{ object.email }}</p>
+                <p><strong>تاريخ الإنشاء:</strong> {{ object.date_joined|date:"Y-m-d" }}</p>
+                <p><strong>آخر دخول:</strong> {{ object.last_login|date:"Y-m-d H:i" }}</p>
+                <p><strong>الصلاحيات:</strong>
+                    {% if object.is_superuser %}
+                        مدير النظام
+                    {% elif object.is_staff %}
+                        مستخدم اداري
+                    {% else %}
+                        مستخدم عادي
+                    {% endif %}
+                </p>
+            </div>
         </div>
     </div>
 
     <!-- ACTIVITY LOG TABLE -->
-    <div class="card shadow-sm">
-        <div class="card-header bg-secondary text-white">
-            سجل نشاط المستخدم
+    <div class="card mt-2 border-light shadow">
+        <div class="card-header h3">
+            سجل النشاط
         </div>
-        <div class="card-body">
+        <div class="mt-2 card-body p-1 table-responsive-lg">
             {% render_table table %}
         </div>
     </div>
 
     <!-- BACK BUTTON -->
-    <div class="mb-3">
+    <div class="mb-3 mt-3">
         <a href="{% url 'manage_users' %}" class="btn btn-outline-secondary">
             <i class="bi bi-arrow-right me-2"></i> العودة إلى إدارة المستخدمين
         </a>
     </div>
 
-</div>
 
 
 {% endblock %}

users/views.py

@@ -7,8 +7,9 @@ from django.contrib.auth.decorators import login_required, user_passes_test
 from django.contrib.auth.mixins import LoginRequiredMixin, UserPassesTestMixin
 from django.http import JsonResponse
 from django.shortcuts import render, redirect, get_object_or_404
-from django_tables2 import RequestConfig, SingleTableView, DetailView
+from django_tables2 import RequestConfig, SingleTableView
 from django_filters.views import FilterView
+from django.views.generic.detail import DetailView
 
 # Project imports
 #################
@@ -140,28 +141,25 @@ class UserActivityLogView(LoginRequiredMixin, UserPassesTestMixin, SingleTableVi
         return context
 
 
-class UserDetailView(LoginRequiredMixin, UserPassesTestMixin, DetailView, SingleTableView):
+class UserDetailView(LoginRequiredMixin, UserPassesTestMixin, DetailView):
     model = User
     template_name = "users/user_detail.html"
-    context_object_name = "detail_user"  # Keep clear naming
-    table_class = UserActivityLogTableNoUser
-    paginate_by = 10
 
     def test_func(self):
         # only staff can view user detail page
         return self.request.user.is_staff
 
-    def get_queryset(self):
-        # This is for the DetailView (only target user)
-        return User.objects.all()
-
-    def get_table_data(self):
-        # filter log table to user in URL
-        return UserActivityLog.objects.filter(user=self.get_object()).order_by('-timestamp')
-
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        context['table'] = self.get_table()  # table instance
+        
+        # self.object is the User instance
+        logs_qs = UserActivityLog.objects.filter(user=self.object).order_by('-timestamp')
+        
+        # Create table manually
+        table = UserActivityLogTableNoUser(logs_qs)
+        RequestConfig(self.request, paginate={'per_page': 10}).configure(table)
+        
+        context['table'] = table
         return context