Merge branch 'brodybranch' into 'main'

Brodybranch

See merge request !20

myproject/myapp/templates/password_change_done.html

+{% extends "_base.html" %} {% block content %}
+
+<div class="container">
+    <h2>Password Changed Successfully</h2>
+    
+    <p>Your password has been changed successfully</p>
+</div>
+
+{% endblock content %}

myproject/myapp/templates/password_change_form.html

+{% extends "_base.html" %} {% block content %}
+
+<div class="container">
+    <h2>Change Your Password</h2>
+    <form method="post">
+        {% csrf_token %}
+        {{ form.as_p }}
+        <button type="submit">Change my password</button>
+    </form>
+</div>
+
+{% endblock content %}
\ No newline at end of file

myproject/myapp/templates/user_page.html

@@ -9,8 +9,11 @@
   </div>
   <!-- Right Content -->
   <div class="col-span-full xl:col-auto">
-
-    <div
+    <div class="p-4 mb-4 bg-white border boder-gray-200 rounded-lg shadow-sm 2xl:col-span-2 dark:border-gray-700 sm:p-6 dark:bg-gray-800">
+      <h3 class="mb-4 text-xl font-semibold dark:text-white">Change your password</h3>
+      <a href="{% url 'password_change' %}" class="text-white bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:ring-blue-300 font-medium rounded-lg text-sm px-5 py-2.5 text-center dark:bg-blue-600 dark:hover:bg-blue-700 dark:focus:ring-blue-800">Change Password</a>
+    </div>
+    <!-- <div
       class="p-4 mb-4 bg-white border border-gray-200 rounded-lg shadow-sm 2xl:col-span-2 dark:border-gray-700 sm:p-6 dark:bg-gray-800"
     >
       <h3 class="mb-4 text-xl font-semibold dark:text-white">
@@ -145,7 +148,7 @@
         </div>
       </form>
       {% comment %} REPLACE WITH LOGIC TO CHECK PROPER USER {% endcomment %}
-    </div>
+    </div> -->
     {% if 1 %}
     <div
       class="p-4 mb-4 bg-white border border-gray-200 rounded-lg shadow-sm 2xl:col-span-2 dark:border-gray-700 sm:p-6 dark:bg-gray-800"

myproject/myapp/urls.py

 from django.urls import path
 from .views import index, users, maintenance, handler404, handler500, register, user_login, terms_conditions, privacy_policy, handling_music_file, pricing, generate_pdf, admin_table
-
+from django.contrib.auth import views as auth_views
 
 urlpatterns = [
     # path('', index, name='index'), <- uncomment when index/main page will be ready
@@ -18,5 +18,7 @@ urlpatterns = [
     path('generate_pdf/', generate_pdf, name='generate_pdf'),
     path('pricing/', pricing, name='pricing'),
     path('generate_pdf/', generate_pdf, name='generate_pdf'),
-    path('admin_table/', admin_table, name='admin_table')
+    path('admin_table/', admin_table, name='admin_table'),
+    path('password_change/', auth_views.PasswordChangeView.as_view(template_name='password_change_form.html'), name='password_change'),
+    path('password_change/done/', auth_views.PasswordChangeDoneView.as_view(template_name='password_change_done.html'), name='password_change_done'),
 ]