feat(favorites): frontend revisions to pray and pay project

.env.example

@@ -44,4 +44,4 @@ IA_SECRET_KEY=""
 FTM_KEY=""
 
 # CL API key for cloning data
-CL_API_KEY=""
+CL_API_TOKEN=""

cl/assets/templates/base.html

@@ -233,7 +233,7 @@ <h1>You did not supply the "private" variable to your template.
                 </li>
                 {% flag "pray-and-pay" %}
                   <li>
-                    <a href="{% url "top_prayers" %}#recap-alerts" tabindex="203">Pray and Pay Project</a>
+                    <a href="{% url "top_prayers" %}" tabindex="203">Pray and Pay Project</a>
                   </li>
                 {% endflag %}
                 <li>

cl/favorites/templates/prayer_email.html

@@ -64,8 +64,8 @@ <h3 class="alt bottom" style="font-size: 1.5em; font-weight: normal; line-height
       </tbody>
     </table>
 
-    <p>You requested it on {{ date_created|date:"M j, Y" }}
-    <p>{{num_waiting}} people were also waiting for it.</p>
+    <p>You requested it on {{ date_created|date:"F j, Y" }}.</p>
+    <p>{{num_waiting}} {{ num_waiting|pluralize:"person was,people were" }} waiting for it.</p>
     {% if price %}<p>Somebody paid ${{ price }} to make it available to all of us.</p>{% endif %}
 
     <p style="font-size: 1em; font-weight: inherit; font-family: inherit; border: 0; vertical-align: baseline; font-style: inherit; margin: 0 0 1.5em; padding: 0;">

cl/favorites/templates/prayer_email.txt

@@ -18,8 +18,8 @@ Date Filed: {% if docket_entry.datetime_filed %}{{ docket_entry.datetime_filed|t
 Description: {% if rd.description %}{{ rd.description|safe|wordwrap:80 }}{% else %}{{ docket_entry.description|default:"Unknown docket entry description"|safe|wordwrap:80 }}{% endif %}
 View Document: https://www.courtlistener.com{{document_url}}
 ~~~
-You requested it on {{ date_created|date:"M j, Y" }}
-{{num_waiting}} people were also waiting for it.
+You requested it on {{ date_created|date:"F j, Y" }}.
+{{num_waiting}} {{ num_waiting|pluralize:"person was,people were" }} waiting for it.
 Somebody paid ${{ price }} to make it available to all of us.
 
 ************************

cl/favorites/templates/top_prayers.html

@@ -3,6 +3,7 @@
 {% load text_filters %}
 {% load static %}
 {% load pacer %}
+{% load humanize %}
 
 {% block title %}RECAP Requests – CourtListener.com{% endblock %}
 {% block og_title %}RECAP Requests – CourtListener.com{% endblock %}
@@ -12,28 +13,54 @@
 
 
 {% block content %}
+  <div class="col-xs-12">
+    <h1 class="text-center">Community's Most Requested Documents</h1>
+  </div>
+
+
+  <div class="col-xs-12">
+    <div class="well well-sm">
+      <p>There have been <b>{{ granted_stats.prayer_count|intcomma }}</b> requests granted for <b>{{ granted_stats.distinct_count|intcomma }}</b> unique documents that cost <b>${{ granted_stats.total_cost }}</b>.</p>
+      <br>
+      <p>There are <b>{{ waiting_stats.prayer_count|intcomma }}</b> requests pending for <b>{{ waiting_stats.distinct_count|intcomma }}</b> unique documents that cost at least <b>${{ waiting_stats.total_cost }}</b>.</p>
+      <br>
+      <p>{% if user.is_authenticated %}
+      <a href="{% url 'user_prayers' user.username %}">View your prayers</a>
+      {% else %}
+        <a href="{% url 'sign-in' %}?next={% url 'top_prayers' %}">Sign in to view your prayers</a>
+      {% endif %}</p>
+    </div>
+  </div>
 
   <div class="col-xs-12">
     <div class="table-responsive">
       <table class="settings-table table">
         <thead>
             <tr>
-              <th>User Preference</th>
-              <th>Document Description</th>
+              <th>Court</th>
+              <th>Case Name</th>
               <th>Document Number</th>
-              <th>PACER Doc ID</th>
-              <th>Document Court</th>
+              <th>Document Description</th>
               <th>Buy on Pacer</th>
             </tr>
         </thead>
         <tbody>
             {% for prayer in top_prayers %}
             <tr>
-              <td>{{ forloop.counter }}</td>
+              <td>{{ prayer.docket_entry.docket.court.citation_string }}</td>
+              {% with docket=prayer.docket_entry.docket %}
+              <td>
+                <a href="{% url "view_docket" docket.pk docket.slug %}">
+                  {{ prayer.docket_entry.docket|best_case_name|safe|v_wrapper }} ({{ prayer.docket_entry.docket.docket_number }})
+                </a>
+              </td>
+              <td>
+                <a href="{% url "view_docket" docket.pk docket.slug %}#entry-{{ prayer.docket_entry.entry_number }}">
+                  {{ prayer.document_number }}
+                </a>
+              </td>
+              {% endwith %}
               <td>{{ prayer.description }}</td>
-              <td>{{ prayer.document_number }}</td>
-              <td>{{ prayer.pacer_doc_id }}</td>
-              <td>{{ prayer.docket_entry.docket.court_id }}</td>
               <td><a href="{{ prayer.pacer_url }}"
                 {% if not request.COOKIES.buy_on_pacer_modal and not request.COOKIES.recap_install_plea %}
                   class="open_buy_pacer_modal btn btn-default btn-xs"

cl/favorites/templates/user_prayers.html

@@ -0,0 +1,118 @@
+{% extends "base.html" %}
+{% load extras %}
+{% load text_filters %}
+{% load static %}
+{% load pacer %}
+{% load tz %}
+{% load humanize %}
+
+{% block title %}{% if is_page_owner %}Your RECAP Requests {% else %}RECAP Requests for: {{ requested_user }}{% endif %} – CourtListener.com{% endblock %}
+{% block og_title %}{% if is_page_owner %}Your RECAP Requests {% else %}RECAP Requests for: {{ requested_user }}{% endif %} – CourtListener.com{% endblock %}
+{% block description %}CourtListener lets you request purchase of legal documents. View the document requests for {{ requested_user }}.{% endblock %}
+{% block og_description %}CourtListener lets you request purchase of legal documents. View the document requests for {{ requested_user }}.{% endblock %}
+
+{% block content %}
+  <div class="col-xs-12">
+    <h1 class="text-center">{% if is_page_owner %}Your RECAP Requests {% else %}RECAP Requests for: {{ requested_user }}{% endif %}</h1>
+  </div>
+
+  <div class="col-xs-12">
+    <div class="well well-sm">
+      {% if is_page_owner %}
+        <p>You have had <b>{{ count|intcomma }}</b> requests fulfilled for documents that cost <b>${{ total_cost|floatformat:2 }}</b>.<p>
+        <p>{% if is_eligible %}You are eligible to make document requests.{% else %}You have reached your daily limit; wait 24 hours to make new requests.{% endif %}</p>
+      {% endif %}
+    </div>
+  </div>
+
+  <div class="col-xs-12">
+    <div class="table-responsive">
+      <table class="settings-table table">
+        <thead>
+            <tr>
+              <th>Court</th>
+              <th>Case Name</th>
+              <th>Document Number</th>
+              <th>Document Description</th>
+              <th>Requested On</th>
+              <th>Status</th>
+              {% if is_page_owner %}<th>Delete</th>{% endif %}
+            </tr>
+        </thead>
+        <tbody>
+            {% for prayer in prayers %}
+            <tr>
+              <td>{{ prayer.docket_entry.docket.court.citation_string }}</td>
+              {% with docket=prayer.docket_entry.docket %}
+              <td>
+                <a href="{% url "view_docket" docket.pk docket.slug %}">
+                  {{ prayer.docket_entry.docket|best_case_name|safe|v_wrapper }} ({{ prayer.docket_entry.docket.docket_number }})
+                </a>
+              </td>
+              <td>
+                <a href="{% url "view_docket" docket.pk docket.slug %}#entry-{{ prayer.docket_entry.entry_number }}">
+                  {{ prayer.document_number }}
+                </a>
+              </td>
+              {% endwith %}
+              <td>{{ prayer.description }}</td>
+              <td>{{ prayer.date_created|date:"M j, Y"  }}</td>
+              <td>{% if prayer.status == WAITING %} Pending {% elif prayer.status == GRANTED %}
+                <div class="btn-group hidden-xs col-sm-4 col-md-3 hidden-print flex">
+                                  {% if rd.filepath_local %}
+                                    <a href="{{ rd.filepath_local.url }}"
+                                       rel="nofollow"
+                                       role="button"
+                                       class="btn btn-primary btn-xs"
+                                            {% if rd.date_upload %}
+                                       title="Uploaded {{ rd.date_upload|timezone:timezone }}"
+                                            {% endif %}>
+                                      Download PDF
+                                    </a>
+                                    <button type="button"
+                                            class="btn btn-primary btn-xs dropdown-toggle"
+                                            data-toggle="dropdown"
+                                            aria-haspopup="true"
+                                            aria-expanded="false">
+                                      <span class="caret"></span>
+                                      <span class="sr-only">Toggle Dropdown</span>
+                                    </button>
+                                    <ul class="dropdown-menu">
+                                      <li>
+                                        <a href="{{ rd.filepath_local.url }}" rel="nofollow">From
+                                          CourtListener</a>
+                                      </li>
+                                      {% if rd.filepath_ia %}
+                                        <li>
+                                          <a href="{{ rd.filepath_ia }}"
+                                             rel="nofollow">From
+                                            Internet Archive</a>
+                                        </li>
+                                      {% endif %} {% endif %} {% endif %}</td>
+              {% if is_page_owner %}<td><a href="{% url 'delete_prayer' recap_document=prayer.pk %}">Delete</a></td>{% endif %}
+              {% comment %} <td><a href="{{ prayer.pacer_url }}"
+                {% if not request.COOKIES.buy_on_pacer_modal and not request.COOKIES.recap_install_plea %}
+                  class="open_buy_pacer_modal btn btn-default btn-xs"
+                  data-toggle="modal" data-target="#modal-buy-pacer"
+                {% else%}
+                  class="btn btn-default btn-xs"
+                {% endif %}
+                  target="_blank"
+                  rel="nofollow">Buy on PACER {% if prayer.page_count %}(${{ prayer|price }}){% endif %}</td> {% endcomment %}
+            </tr>
+            {% empty %}
+            <tr>
+                <td colspan="2">No document requests made. Consider making one!</td>
+            </tr>
+            {% endfor %}
+        </tbody>
+      </table>
+    </div>
+  </div>
+{% endblock %}
+
+{% block footer-scripts %}
+  <script defer type="text/javascript"
+            src="{% static "js/buy_pacer_modal.js" %}"></script>
+  {% include "includes/buy_pacer_modal.html" %}
+{% endblock %}

cl/favorites/tests.py

@@ -980,11 +980,11 @@ async def test_prayers_integration(self) -> None:
             email_text_content,
         )
         self.assertIn(
-            f"You requested it on {template_date(make_naive(prayer_1.date_created), 'M j, Y')}",
+            f"You requested it on {template_date(make_naive(prayer_1.date_created), 'F j, Y')}",
             email_text_content,
         )
         self.assertIn(
-            f"{len(actual_top_prayers)} people were also waiting for it.",
+            f"{len(actual_top_prayers)} people were waiting for it.",
             email_text_content,
         )
         self.assertIn(
@@ -997,11 +997,11 @@ async def test_prayers_integration(self) -> None:
             html_content,
         )
         self.assertIn(
-            f"{len(actual_top_prayers)} people were also waiting for it.",
+            f"{len(actual_top_prayers)} people were waiting for it.",
             html_content,
         )
         self.assertIn(
-            f"You requested it on {template_date(make_naive(prayer_1.date_created), 'M j, Y')}",
+            f"You requested it on {template_date(make_naive(prayer_1.date_created), 'F j, Y')}",
             html_content,
         )
         self.assertIn(

cl/favorites/urls.py

@@ -6,6 +6,7 @@
     delete_prayer_view,
     open_prayers,
     save_or_update_note,
+    user_prayers_view,
     view_tag,
     view_tags,
 )
@@ -25,6 +26,7 @@
         name="view_tag",
     ),
     path("tags/<str:username>/", view_tags, name="tag_list"),
+    # Prayer pages
     path("prayers/top/", open_prayers, name="top_prayers"),
     path(
         "prayer/create/<int:recap_document>/",
@@ -36,4 +38,5 @@
         delete_prayer_view,
         name="delete_prayer",
     ),
+    path("prayers/<str:username>/", user_prayers_view, name="user_prayers"),
 ]