Merge pull request #119 from adamspd/release-v3.3.0

Small fixes & update version release

Author: adamspd

appointment/__init__.py

@@ -5,5 +5,5 @@
 __package_name__ = "django-appointment"
 __url__ = "https://github.com/adamspd/django-appointment"
 __package_website__ = "https://django-appt.adamspierredavid.com/"
-__version__ = "3.2.0"
+__version__ = "3.3.0"
 __test_version__ = False

appointment/admin.py

@@ -9,8 +9,10 @@
 from django import forms
 from django.contrib import admin
 
-from .models import (Appointment, AppointmentRequest, AppointmentRescheduleHistory, Config, DayOff,
-                     EmailVerificationCode, Service, StaffMember, WorkingHours)
+from .models import (
+    Appointment, AppointmentRequest, AppointmentRescheduleHistory, Config, DayOff, EmailVerificationCode,
+    PasswordResetToken, Service, StaffMember, WorkingHours
+)
 
 
 @admin.register(Service)
@@ -91,3 +93,12 @@ class AppointmentRescheduleHistoryAdmin(admin.ModelAdmin):
     list_filter = ('appointment_request__service', 'date', 'created_at')
     date_hierarchy = 'created_at'
     ordering = ('-created_at',)
+
+
+@admin.register(PasswordResetToken)
+class PasswordResetTokenAdmin(admin.ModelAdmin):
+    list_display = ('user', 'token', 'expires_at', 'status')
+    search_fields = ('user__email', 'token')
+    list_filter = ('status', 'expires_at')
+    date_hierarchy = 'expires_at'
+    ordering = ('-expires_at',)

appointment/templates/appointment/rescheduling_thank_you.html

@@ -11,26 +11,30 @@
             align-items: center;
             min-height: 40vh;
         }
+
         .confirmation-message {
             max-width: 600px;
             text-align: center;
             padding: 20px;
             background-color: #ffffff;
             border: 1px solid #dee2e6;
             border-radius: 5px;
-            box-shadow: 0 4px 6px rgba(0,0,0,.1);
+            box-shadow: 0 4px 6px rgba(0, 0, 0, .1);
         }
+
         .confirmation-message h1 {
             color: #333;
             font-size: 24px;
             font-weight: 600;
             margin-bottom: 20px;
         }
+
         .confirmation-message p {
             color: #555;
             font-size: 16px;
             line-height: 1.6;
         }
+
         .confirmation-message a {
             display: inline-block;
             margin-top: 25px;
@@ -41,6 +45,7 @@
             text-decoration: none;
             font-weight: 500;
         }
+
         .confirmation-message a:hover {
             background-color: #0056b3;
         }

appointment/templates/base_templates/base.html

@@ -35,11 +35,11 @@
 <script nomodule src="https://unpkg.com/[email protected]/dist/ionicons/ionicons.js"></script>
 
 <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.7.1/jquery.min.js"
-            integrity="sha512-v2CJ7UaYy4JwqLDIrZUI/4hqeoQieOmAZNXBeQyjo21dadnwR+8ZaIJVT8EE2iyI61OV8e6M8PP2/4hpQINQ/g=="
-            crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+        integrity="sha512-v2CJ7UaYy4JwqLDIrZUI/4hqeoQieOmAZNXBeQyjo21dadnwR+8ZaIJVT8EE2iyI61OV8e6M8PP2/4hpQINQ/g=="
+        crossorigin="anonymous" referrerpolicy="no-referrer"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.3.2/js/bootstrap.min.js"
-            integrity="sha512-WW8/jxkELe2CAiE4LvQfwm1rajOS8PHasCCx+knHG0gBHt8EXxS6T6tJRTGuDQVnluuAvMxWF4j8SNFDKceLFg=="
-            crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+        integrity="sha512-WW8/jxkELe2CAiE4LvQfwm1rajOS8PHasCCx+knHG0gBHt8EXxS6T6tJRTGuDQVnluuAvMxWF4j8SNFDKceLFg=="
+        crossorigin="anonymous" referrerpolicy="no-referrer"></script>
 {% block customJS %}{% endblock %}
 
 <!--end footer-->

appointment/templates/email_sender/admin_new_appointment_email.html

@@ -13,6 +13,7 @@
             padding: 20px;
             margin: 0;
         }
+
         .email-container {
             background-color: #ffffff;
             padding: 25px;
@@ -21,20 +22,24 @@
             border-radius: 5px;
             box-shadow: 0 4px 8px rgba(0, 0, 0, 0.05);
         }
+
         h1 {
             color: #333;
             font-size: 24px;
         }
+
         p {
             font-size: 16px;
             line-height: 1.6;
         }
+
         .appointment-details {
             background-color: #f9f9f9;
             padding: 15px;
             margin-top: 20px;
             border-left: 5px solid #007bff;
         }
+
         .footer {
             margin-top: 30px;
             font-size: 14px;
@@ -44,25 +49,26 @@
     </style>
 </head>
 <body>
-    <div class="email-container">
-        <h1>{% translate 'New Appointment Request' %}</h1>
-        <p>{% translate 'Dear Admin,' %}</p>
-        <p>{% translate 'You have received a new appointment request. Here are the details:' %}</p>
+<div class="email-container">
+    <h1>{% translate 'New Appointment Request' %}</h1>
+    <p>{% translate 'Dear Admin,' %}</p>
+    <p>{% translate 'You have received a new appointment request. Here are the details:' %}</p>
 
-        <div class="appointment-details">
-            <p><strong>{% translate 'Client Name' %}:</strong> {{ client_name }}</p>
-            <p><strong>{% translate 'Service Requested' %}:</strong> {{ appointment.get_service_name }}</p>
-            <p><strong>{% translate 'Appointment Date' %}:</strong> {{ appointment.appointment_request.date }}</p>
-            <p><strong>{% translate 'Time' %}:</strong> {{ appointment.appointment_request.start_time }} - {{ appointment.appointment_request.end_time }}</p>
-            <p><strong>{% translate 'Contact Details' %}:</strong> {{ appointment.phone }} | {{ client_email }}</p>
-            <p><strong>{% translate 'Additional Info' %}:</strong> {{ appointment.additional_info|default:"N/A" }}</p>
-        </div>
+    <div class="appointment-details">
+        <p><strong>{% translate 'Client Name' %}:</strong> {{ client_name }}</p>
+        <p><strong>{% translate 'Service Requested' %}:</strong> {{ appointment.get_service_name }}</p>
+        <p><strong>{% translate 'Appointment Date' %}:</strong> {{ appointment.appointment_request.date }}</p>
+        <p><strong>{% translate 'Time' %}:</strong> {{ appointment.appointment_request.start_time }}
+            - {{ appointment.appointment_request.end_time }}</p>
+        <p><strong>{% translate 'Contact Details' %}:</strong> {{ appointment.phone }} | {{ client_email }}</p>
+        <p><strong>{% translate 'Additional Info' %}:</strong> {{ appointment.additional_info|default:"N/A" }}</p>
+    </div>
 
-        <p>{% translate 'Please review the appointment request and take the necessary action.' %}</p>
+    <p>{% translate 'Please review the appointment request and take the necessary action.' %}</p>
 
-        <div class="footer">
-            <p>{% translate 'This is an automated message. Please do not reply directly to this email.' %}</p>
-        </div>
+    <div class="footer">
+        <p>{% translate 'This is an automated message. Please do not reply directly to this email.' %}</p>
     </div>
+</div>
 </body>
 </html>