From cd6da05eaac0ee46065c6d1c5fd6fce282594215 Mon Sep 17 00:00:00 2001
From: Ansh Goyal <anshg1214@gmail.com>
Date: Sun, 23 Jan 2022 10:41:21 +0530
Subject: [PATCH 1/7] Add user ratings on profile page

---
 critiquebrainz/frontend/messages.pot          | 43 ++++++++++---------
 .../frontend/templates/user/base.html         |  5 +++
 .../frontend/templates/user/reviews.html      |  7 +++
 3 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/critiquebrainz/frontend/messages.pot b/critiquebrainz/frontend/messages.pot
index 96e5942e5..874c3dc37 100644
--- a/critiquebrainz/frontend/messages.pot
+++ b/critiquebrainz/frontend/messages.pot
@@ -1,14 +1,14 @@
 # Translations template for PROJECT.
-# Copyright (C) 2021 ORGANIZATION
+# Copyright (C) 2022 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2021.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2022.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-08-30 15:52+0000\n"
+"POT-Creation-Date: 2022-01-22 18:40+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -211,6 +211,7 @@ msgstr ""
 
 #: critiquebrainz/frontend/forms/rate.py:26
 #: critiquebrainz/frontend/forms/review.py:43
+#: critiquebrainz/frontend/templates/user/reviews.html:19
 msgid "Rating"
 msgstr ""
 
@@ -270,9 +271,9 @@ msgstr ""
 #: critiquebrainz/frontend/templates/review/entity/artist.html:15
 #: critiquebrainz/frontend/templates/review/modify/artist.html:8
 #: critiquebrainz/frontend/templates/review/modify/release_group.html:8
-#: critiquebrainz/frontend/templates/user/reviews.html:36
-#: critiquebrainz/frontend/templates/user/reviews.html:66
-#: critiquebrainz/frontend/templates/user/reviews.html:69
+#: critiquebrainz/frontend/templates/user/reviews.html:37
+#: critiquebrainz/frontend/templates/user/reviews.html:67
+#: critiquebrainz/frontend/templates/user/reviews.html:70
 msgid "[Unknown artist]"
 msgstr ""
 
@@ -530,8 +531,8 @@ msgstr ""
 #: critiquebrainz/frontend/templates/review/modify/work.html:18
 #: critiquebrainz/frontend/templates/search/selector_results.html:29
 #: critiquebrainz/frontend/templates/search/selector_results.html:77
-#: critiquebrainz/frontend/templates/user/reviews.html:45
-#: critiquebrainz/frontend/templates/user/reviews.html:59
+#: critiquebrainz/frontend/templates/user/reviews.html:46
+#: critiquebrainz/frontend/templates/user/reviews.html:60
 msgid "more"
 msgstr ""
 
@@ -1163,7 +1164,7 @@ msgstr ""
 #: critiquebrainz/frontend/templates/review/modify/edit.html:5
 #: critiquebrainz/frontend/templates/review/modify/release_group.html:11
 #: critiquebrainz/frontend/templates/review/report.html:4
-#: critiquebrainz/frontend/templates/user/reviews.html:32
+#: critiquebrainz/frontend/templates/user/reviews.html:33
 msgid "[Unknown release group]"
 msgstr ""
 
@@ -1439,7 +1440,7 @@ msgid "Modify"
 msgstr ""
 
 #: critiquebrainz/frontend/templates/profile/applications/index.html:36
-#: critiquebrainz/frontend/templates/user/reviews.html:112
+#: critiquebrainz/frontend/templates/user/reviews.html:119
 msgid "Delete"
 msgstr ""
 
@@ -1550,7 +1551,7 @@ msgstr ""
 #: critiquebrainz/frontend/templates/review/entity/event.html:15
 #: critiquebrainz/frontend/templates/review/modify/edit.html:7
 #: critiquebrainz/frontend/templates/review/modify/event.html:8
-#: critiquebrainz/frontend/templates/user/reviews.html:39
+#: critiquebrainz/frontend/templates/user/reviews.html:40
 msgid "[Unknown event]"
 msgstr ""
 
@@ -1560,7 +1561,7 @@ msgstr ""
 #: critiquebrainz/frontend/templates/review/entity/place.html:20
 #: critiquebrainz/frontend/templates/review/modify/edit.html:9
 #: critiquebrainz/frontend/templates/review/modify/place.html:8
-#: critiquebrainz/frontend/templates/user/reviews.html:50
+#: critiquebrainz/frontend/templates/user/reviews.html:51
 msgid "[Unknown place]"
 msgstr ""
 
@@ -1772,7 +1773,7 @@ msgstr ""
 #: critiquebrainz/frontend/templates/review/entity/label.html:6
 #: critiquebrainz/frontend/templates/review/entity/label.html:15
 #: critiquebrainz/frontend/templates/review/modify/label.html:8
-#: critiquebrainz/frontend/templates/user/reviews.html:75
+#: critiquebrainz/frontend/templates/user/reviews.html:76
 msgid "[Unknown label]"
 msgstr ""
 
@@ -1799,7 +1800,7 @@ msgstr ""
 #: critiquebrainz/frontend/templates/review/entity/recording.html:6
 #: critiquebrainz/frontend/templates/review/entity/recording.html:15
 #: critiquebrainz/frontend/templates/review/modify/recording.html:8
-#: critiquebrainz/frontend/templates/user/reviews.html:65
+#: critiquebrainz/frontend/templates/user/reviews.html:66
 msgid "[Unknown recording]"
 msgstr ""
 
@@ -1811,7 +1812,7 @@ msgstr ""
 #: critiquebrainz/frontend/templates/review/entity/work.html:6
 #: critiquebrainz/frontend/templates/review/entity/work.html:15
 #: critiquebrainz/frontend/templates/review/modify/work.html:8
-#: critiquebrainz/frontend/templates/user/reviews.html:53
+#: critiquebrainz/frontend/templates/user/reviews.html:54
 msgid "[Unknown work]"
 msgstr ""
 
@@ -1874,12 +1875,12 @@ msgid "Status"
 msgstr ""
 
 #: critiquebrainz/frontend/templates/review/modify/edit.html:28
-#: critiquebrainz/frontend/templates/user/reviews.html:90
+#: critiquebrainz/frontend/templates/user/reviews.html:91
 msgid "Draft"
 msgstr ""
 
 #: critiquebrainz/frontend/templates/review/modify/edit.html:30
-#: critiquebrainz/frontend/templates/user/reviews.html:92
+#: critiquebrainz/frontend/templates/user/reviews.html:93
 msgid "Published"
 msgstr ""
 
@@ -2116,19 +2117,19 @@ msgstr ""
 msgid "This month"
 msgstr ""
 
-#: critiquebrainz/frontend/templates/user/reviews.html:98
+#: critiquebrainz/frontend/templates/user/reviews.html:99
 msgid "Hidden"
 msgstr ""
 
-#: critiquebrainz/frontend/templates/user/reviews.html:111
+#: critiquebrainz/frontend/templates/user/reviews.html:118
 msgid "Edit"
 msgstr ""
 
-#: critiquebrainz/frontend/templates/user/reviews.html:123
+#: critiquebrainz/frontend/templates/user/reviews.html:130
 msgid "Newer"
 msgstr ""
 
-#: critiquebrainz/frontend/templates/user/reviews.html:126
+#: critiquebrainz/frontend/templates/user/reviews.html:133
 msgid "Older"
 msgstr ""
 
diff --git a/critiquebrainz/frontend/templates/user/base.html b/critiquebrainz/frontend/templates/user/base.html
index dede0afc0..d275b5806 100644
--- a/critiquebrainz/frontend/templates/user/base.html
+++ b/critiquebrainz/frontend/templates/user/base.html
@@ -30,3 +30,8 @@ <h2 class="pull-left"><img class="avatar" src="{{ user.avatar }}&s=32" /> {{ use
     {% block profile_content %}{% endblock %}
   </div>
 {% endblock %}
+
+{% block scripts %}
+  {{ super() }}
+  <script src="{{ get_static_path('rating.js') }}"></script>
+{% endblock %}
diff --git a/critiquebrainz/frontend/templates/user/reviews.html b/critiquebrainz/frontend/templates/user/reviews.html
index e6dbdc6ab..4de887489 100644
--- a/critiquebrainz/frontend/templates/user/reviews.html
+++ b/critiquebrainz/frontend/templates/user/reviews.html
@@ -16,6 +16,7 @@
         <th>{{ _('Created on') }}</th>
         <th>{{ _('Published on')}} </th>
         <th>{{ _('Votes (+/-)') }}</th>
+		  <th>{{ _('Rating') }}</th>
         {% if current_user.is_authenticated and current_user == user %}
           <th><!-- Buttons --></th>
         {% endif %}
@@ -106,6 +107,12 @@
             <td>{{ review.published_on | date }}</td>
           {% endif %}
           <td>{{ review.votes_positive_count }}/{{ review.votes_negative_count }}</td>
+          <td>{% if review.rating %}
+              <input type="number" class="rating" id="rating" value={{ review.rating }} data-readonly data-inline />
+            {% else %}
+              <input type="number" class="rating" id="rating" value=0 data-readonly data-inline />
+            {% endif %}
+          </td>
           {% if current_user.is_authenticated and current_user == user %}
             <td>
               <a class="btn btn-primary btn-xs" href="{{ url_for('review.edit', id=review.id) }}">{{ _('Edit') }}</a>

From 76dccd16c2a011159f03add1220e9d256a7c8c07 Mon Sep 17 00:00:00 2001
From: akshaaatt <tiwariakshat03@gmail.com>
Date: Sun, 23 Jan 2022 20:51:56 +0530
Subject: [PATCH 2/7] Temporary fix for certificate verification

---
 docker/Dockerfile.dev | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev
index 959973795..7a3b4305b 100644
--- a/docker/Dockerfile.dev
+++ b/docker/Dockerfile.dev
@@ -18,7 +18,7 @@ RUN apt-get update \
     && rm -rf /var/lib/apt/lists/*
 
 # PostgreSQL client
-RUN curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
+RUN curl --insecure https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
 ENV PG_MAJOR 12
 RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ xenial-pgdg main' $PG_MAJOR > /etc/apt/sources.list.d/pgdg.list
 RUN apt-get update \

From 0778498c8434944ae6d9388e07c98e8e9e1e6747 Mon Sep 17 00:00:00 2001
From: akshaaatt <tiwariakshat03@gmail.com>
Date: Sun, 23 Jan 2022 21:12:19 +0530
Subject: [PATCH 3/7] Permanent fix for certificate verification

---
 Dockerfile            | 7 +++++++
 docker/Dockerfile.dev | 9 ++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 9fd9dceb8..c8c8dff86 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,12 @@
 FROM metabrainz/python:3.8-20210115
 
+# remove expired let's encrypt certificate and install new ones
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends ca-certificates \
+    && rm -rf /usr/share/ca-certificates/mozilla/DST_Root_CA_X3.crt \
+    && update-ca-certificates \
+    && rm -rf /var/lib/apt/lists/*
+
 RUN apt-get update \
      && apt-get install -y --no-install-recommends \
                         build-essential \
diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev
index 7a3b4305b..4e90c1886 100644
--- a/docker/Dockerfile.dev
+++ b/docker/Dockerfile.dev
@@ -1,5 +1,12 @@
 FROM metabrainz/python:3.8-20210115
 
+# remove expired let's encrypt certificate and install new ones
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends ca-certificates \
+    && rm -rf /usr/share/ca-certificates/mozilla/DST_Root_CA_X3.crt \
+    && update-ca-certificates \
+    && rm -rf /var/lib/apt/lists/*
+
 ENV DOCKERIZE_VERSION v0.6.1
 RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
     && tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz
@@ -18,7 +25,7 @@ RUN apt-get update \
     && rm -rf /var/lib/apt/lists/*
 
 # PostgreSQL client
-RUN curl --insecure https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
+RUN curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
 ENV PG_MAJOR 12
 RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ xenial-pgdg main' $PG_MAJOR > /etc/apt/sources.list.d/pgdg.list
 RUN apt-get update \

From b0e0d91237b46f3006aa2ea553c8d6441123486c Mon Sep 17 00:00:00 2001
From: Ansh Goyal <anshg1214@gmail.com>
Date: Fri, 28 Jan 2022 00:28:55 +0530
Subject: [PATCH 4/7] Changed Script tag location

---
 critiquebrainz/frontend/templates/user/base.html    | 5 -----
 critiquebrainz/frontend/templates/user/reviews.html | 5 +++++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/critiquebrainz/frontend/templates/user/base.html b/critiquebrainz/frontend/templates/user/base.html
index d275b5806..dede0afc0 100644
--- a/critiquebrainz/frontend/templates/user/base.html
+++ b/critiquebrainz/frontend/templates/user/base.html
@@ -30,8 +30,3 @@ <h2 class="pull-left"><img class="avatar" src="{{ user.avatar }}&s=32" /> {{ use
     {% block profile_content %}{% endblock %}
   </div>
 {% endblock %}
-
-{% block scripts %}
-  {{ super() }}
-  <script src="{{ get_static_path('rating.js') }}"></script>
-{% endblock %}
diff --git a/critiquebrainz/frontend/templates/user/reviews.html b/critiquebrainz/frontend/templates/user/reviews.html
index 4de887489..3d1fe61a3 100644
--- a/critiquebrainz/frontend/templates/user/reviews.html
+++ b/critiquebrainz/frontend/templates/user/reviews.html
@@ -136,3 +136,8 @@
     {% endif %}
   {% endif %}
 {% endblock %}
+
+{% block scripts %}
+  {{ super() }}
+  <script src="{{ get_static_path('rating.js') }}"></script>
+{% endblock %}

From 51e1886d2085edb38bf9e6dea6e449e13f4f4b8e Mon Sep 17 00:00:00 2001
From: Ansh Goyal <anshg1214@gmail.com>
Date: Sat, 29 Jan 2022 12:15:23 +0530
Subject: [PATCH 5/7] Add pagination to macros

---
 critiquebrainz/frontend/messages.pot          | 57 ++++++++-----------
 .../frontend/templates/artist/entity.html     | 13 +----
 critiquebrainz/frontend/templates/macros.html | 39 ++++++++++++-
 .../frontend/templates/mapping/spotify.html   | 15 +----
 .../frontend/templates/review/browse.html     | 13 +----
 .../frontend/templates/user/reviews.html      | 11 +---
 .../frontend/templates/work/entity.html       | 13 +----
 7 files changed, 71 insertions(+), 90 deletions(-)

diff --git a/critiquebrainz/frontend/messages.pot b/critiquebrainz/frontend/messages.pot
index 874c3dc37..7e19c31c9 100644
--- a/critiquebrainz/frontend/messages.pot
+++ b/critiquebrainz/frontend/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-01-22 18:40+0000\n"
+"POT-Creation-Date: 2022-01-29 06:35+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -536,6 +536,14 @@ msgstr ""
 msgid "more"
 msgstr ""
 
+#: critiquebrainz/frontend/templates/macros.html:229
+msgid "Previous"
+msgstr ""
+
+#: critiquebrainz/frontend/templates/macros.html:255
+msgid "Next"
+msgstr ""
+
 #: critiquebrainz/frontend/templates/navbar.html:6
 msgid "Toggle navigation"
 msgstr ""
@@ -691,57 +699,45 @@ msgid_plural "%(num)d reviews"
 msgstr[0] ""
 msgstr[1] ""
 
-#: critiquebrainz/frontend/templates/artist/entity.html:154
-#: critiquebrainz/frontend/templates/review/browse.html:57
-#: critiquebrainz/frontend/templates/work/entity.html:105
-msgid "Previous"
-msgstr ""
-
-#: critiquebrainz/frontend/templates/artist/entity.html:157
-#: critiquebrainz/frontend/templates/review/browse.html:60
-#: critiquebrainz/frontend/templates/work/entity.html:108
-msgid "Next"
-msgstr ""
-
-#: critiquebrainz/frontend/templates/artist/entity.html:168
+#: critiquebrainz/frontend/templates/artist/entity.html:159
 msgid "Artist information"
 msgstr ""
 
-#: critiquebrainz/frontend/templates/artist/entity.html:174
+#: critiquebrainz/frontend/templates/artist/entity.html:165
 msgid "Member of"
 msgstr ""
 
-#: critiquebrainz/frontend/templates/artist/entity.html:176
+#: critiquebrainz/frontend/templates/artist/entity.html:167
 msgid "Members"
 msgstr ""
 
-#: critiquebrainz/frontend/templates/artist/entity.html:185
-#: critiquebrainz/frontend/templates/artist/entity.html:205
+#: critiquebrainz/frontend/templates/artist/entity.html:176
+#: critiquebrainz/frontend/templates/artist/entity.html:196
 msgid "View all..."
 msgstr ""
 
-#: critiquebrainz/frontend/templates/artist/entity.html:193
+#: critiquebrainz/frontend/templates/artist/entity.html:184
 msgid "Former member of"
 msgstr ""
 
-#: critiquebrainz/frontend/templates/artist/entity.html:195
+#: critiquebrainz/frontend/templates/artist/entity.html:186
 msgid "Former members"
 msgstr ""
 
-#: critiquebrainz/frontend/templates/artist/entity.html:212
+#: critiquebrainz/frontend/templates/artist/entity.html:203
 #: critiquebrainz/frontend/templates/label/entity.html:75
 #: critiquebrainz/frontend/templates/place/entity.html:105
 #: critiquebrainz/frontend/templates/recording/entity.html:95
-#: critiquebrainz/frontend/templates/work/entity.html:121
+#: critiquebrainz/frontend/templates/work/entity.html:112
 msgid "External links"
 msgstr ""
 
-#: critiquebrainz/frontend/templates/artist/entity.html:232
+#: critiquebrainz/frontend/templates/artist/entity.html:223
 #: critiquebrainz/frontend/templates/event/entity.html:142
 #: critiquebrainz/frontend/templates/label/entity.html:95
 #: critiquebrainz/frontend/templates/place/entity.html:135
 #: critiquebrainz/frontend/templates/recording/entity.html:115
-#: critiquebrainz/frontend/templates/work/entity.html:141
+#: critiquebrainz/frontend/templates/work/entity.html:132
 msgid "Edit on MusicBrainz"
 msgstr ""
 
@@ -2125,14 +2121,6 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: critiquebrainz/frontend/templates/user/reviews.html:130
-msgid "Newer"
-msgstr ""
-
-#: critiquebrainz/frontend/templates/user/reviews.html:133
-msgid "Older"
-msgstr ""
-
 #: critiquebrainz/frontend/templates/work/entity.html:68
 msgid "Recordings"
 msgstr ""
@@ -2141,7 +2129,7 @@ msgstr ""
 msgid "No recordings found"
 msgstr ""
 
-#: critiquebrainz/frontend/templates/work/entity.html:118
+#: critiquebrainz/frontend/templates/work/entity.html:109
 msgid "Work information"
 msgstr ""
 
@@ -2202,7 +2190,8 @@ msgstr ""
 msgid "No logs to display."
 msgstr ""
 
-#: critiquebrainz/frontend/views/login.py:34
+#: critiquebrainz/frontend/views/login.py:36
+#: critiquebrainz/frontend/views/login.py:38
 msgid "Login failed."
 msgstr ""
 
diff --git a/critiquebrainz/frontend/templates/artist/entity.html b/critiquebrainz/frontend/templates/artist/entity.html
index 3e988b251..4aecc4620 100644
--- a/critiquebrainz/frontend/templates/artist/entity.html
+++ b/critiquebrainz/frontend/templates/artist/entity.html
@@ -1,5 +1,5 @@
 {% extends 'base.html' %}
-{% from 'macros.html' import cover_art, entity_rate_form, show_avg_rating with context %}
+{% from 'macros.html' import cover_art, entity_rate_form, show_avg_rating, display_pagination with context %}
 {% from 'common.html' import rating_script with context %}
 
 {% block title %}{{ artist.name }} - CritiqueBrainz{% endblock %}
@@ -148,16 +148,7 @@ <h4>{{ _('Discography') }}</h4>
         <div class="clearfix"></div>
 
         {% if release_group_count > release_groups_limit %}
-          <div class="col-md-12">
-            <ul class="pager">
-              {% if page > 1 %}
-                <li class="previous"><a href="{{ url_for('artist.entity', id=id, release_type=release_type, page=page-1) }}">&larr; {{ _('Previous') }}</a></li>
-              {% endif %}
-              {% if page-1 < release_group_count//release_groups_limit %}
-                <li class="next"><a href="{{ url_for('artist.entity', id=id, release_type=release_type, page=page+1) }}">{{ _('Next') }} &rarr;</a></li>
-              {% endif %}
-            </ul>
-          </div>
+          {{ display_pagination(page, (release_group_count/release_groups_limit)|round(method='ceil')|int, 'artist.entity', {'id': id, 'release_type':release_type}) }}
         {% endif %}
       </div>
     {% endif %}
diff --git a/critiquebrainz/frontend/templates/macros.html b/critiquebrainz/frontend/templates/macros.html
index 522e19aed..6c634fbf9 100644
--- a/critiquebrainz/frontend/templates/macros.html
+++ b/critiquebrainz/frontend/templates/macros.html
@@ -94,7 +94,7 @@
     <script>
       $('img').last()
         .on('error', function () {
-          $(this).attr('src', '{{ get_static_path('images/placeholder_disc.svg') }}');
+          $(this).attr('src', "{{ get_static_path('images/placeholder_disc.svg') }}");
           if ('{{ release_group_page }}' == 'True')
             $("#mb-call-to-act").css('display','block');
           else
@@ -220,3 +220,40 @@ <h4 style="margin-bottom:0;">{{ _('Rate this {}:'.format(entity_type_readable))
         -
     {% endif %}
 {% endmacro %}
+
+{% macro display_pagination(current_page, total_pages, page_info, parameter) %}
+  <div class="col-md-12 text-center">
+    <nav aria-label="Page navigation">
+      <ul class="pagination">
+
+        <li class="previous {{'disabled' if current_page <= 1 }}"><a aria-label="Previous" href="{{ url_for(page_info, page=page-1, **parameter) }}">&larr; {{ _('Previous') }}</a></li>
+        
+        <li {{ "class=active" if current_page == 1 }}><a href="{{ url_for(page_info, page=1,  **parameter) }}">{{ 1 }}</a></li>
+
+        {% if current_page > 5 %}
+          <li class="disabled"><a>{{ '...' }}</a></li>
+        {% endif %}
+
+        {% if current_page == 5 %}
+          <li {{ "class=active" if current_page == 2 }}><a href="{{ url_for(page_info, page=2, **parameter) }}">{{ 2 }}</a></li>
+        {% endif %}
+
+        {% for page_index in range([2,current_page-2]|max, [total_pages,current_page+3]|min) %}
+          <li {{ "class=active" if current_page == page_index }}><a href="{{ url_for(page_info, page=page_index, **parameter) }}">{{ page_index }}</a></li>
+        {% endfor %}
+
+        {% if current_page == (total_pages-4) %}
+          <li {{ "class=active" if current_page == total_pages-1 }}><a href="{{ url_for(page_info, page=(total_pages-1), **parameter) }}">{{ total_pages-1 }}</a></li>
+        {% endif %}
+
+        {% if (current_page < (total_pages - 4)) %}
+          <li class='disabled'><a>{{ '...' }}</a></li>
+        {% endif %}
+
+        <li {{ "class=active" if current_page == total_pages }}><a href="{{ url_for(page_info, page=total_pages, **parameter) }}">{{ total_pages }}</a></li>
+
+        <li class="next {{'disabled' if current_page-1 >= count//limit }}"><a aria-label="Next" href="{{ url_for(page_info, page=page+1, **parameter) }}">{{ _('Next') }} &rarr;</a></li>
+      </ul>
+    </nav>
+  </div>
+{% endmacro %}
\ No newline at end of file
diff --git a/critiquebrainz/frontend/templates/mapping/spotify.html b/critiquebrainz/frontend/templates/mapping/spotify.html
index 2644d12ee..ec82aad90 100644
--- a/critiquebrainz/frontend/templates/mapping/spotify.html
+++ b/critiquebrainz/frontend/templates/mapping/spotify.html
@@ -1,5 +1,5 @@
 {% extends 'base.html' %}
-
+{% from 'macros.html' import display_pagination with context %}
 {% block title %}{{ _('Spotify album mapping') }} - CritiqueBrainz{% endblock %}
 
 {% block content %}
@@ -47,18 +47,7 @@ <h2>{{ _('Spotify album mapping') }}</h2>
     {% endfor %}
   </div>
   {% if count > limit %}
-    <div class="row">
-      <div class="col-md-12">
-        <ul class="pager">
-          {% if page > 1 %}
-            <li class="previous"><a href="{{ url_for('mapping.spotify_add', release_group_id=release_group.id, page=page-1) }}">&larr; {{ _('Previous') }}</a></li>
-          {% endif %}
-          {% if page-1 < count//limit %}
-            <li class="next"><a href="{{ url_for('mapping.spotify_add', release_group_id=release_group.id, page=page + 1) }}">{{ _('Next') }} &rarr;</a></li>
-          {% endif %}
-        </ul>
-      </div>
-    </div>
+    {{ display_pagination(page, (count/limit)|round(method='ceil')|int, 'mapping.spotify_add', {'release_group_id':release_group.id}) }}
   {% endif %}
 {% else %}
   <p class="lead" style="text-align:center; margin-top:20px;">{{ _('No similar albums found') }}</p>
diff --git a/critiquebrainz/frontend/templates/review/browse.html b/critiquebrainz/frontend/templates/review/browse.html
index f6576799e..1867d8294 100644
--- a/critiquebrainz/frontend/templates/review/browse.html
+++ b/critiquebrainz/frontend/templates/review/browse.html
@@ -1,5 +1,5 @@
 {% extends 'base.html' %}
-{% from 'macros.html' import cover_art, review_credit with context %}
+{% from 'macros.html' import cover_art, review_credit, display_pagination with context %}
 
 {% block title %}{{ _('Reviews') }} - CritiqueBrainz{% endblock %}
 
@@ -51,16 +51,7 @@ <h2>{{ _('Reviews') }}</h2>
 </div>
 
 {% if count > limit %}
-  <div class="col-md-12">
-    <ul class="pager">
-      {% if page > 1 %}
-        <li class="previous"><a href="{{ url_for('review.browse', entity_type=entity_type, page=page-1) }}">&larr; {{ _('Previous') }}</a></li>
-      {% endif %}
-      {% if page-1 < count//limit %}
-        <li class="next"><a href="{{ url_for('review.browse', entity_type=entity_type, page=page+1) }}">{{ _('Next') }} &rarr;</a></li>
-      {% endif %}
-    </ul>
-  </div>
+  {{ display_pagination(page, (count/limit)|round(method='ceil')|int, 'review.browse', {'entity_type':entity_type}) }}
 {% endif %}
 
 {% endblock %}
diff --git a/critiquebrainz/frontend/templates/user/reviews.html b/critiquebrainz/frontend/templates/user/reviews.html
index 3d1fe61a3..95af3ef83 100644
--- a/critiquebrainz/frontend/templates/user/reviews.html
+++ b/critiquebrainz/frontend/templates/user/reviews.html
@@ -1,5 +1,5 @@
 {% extends 'user/base.html' %}
-
+{% from 'macros.html' import display_pagination with context %}
 {% block title %}{{ user.display_name }} - {{ _('Reviews') }} - CritiqueBrainz{% endblock %}
 
 {% block profile_content %}
@@ -125,14 +125,7 @@
     </table>
 
     {% if count > limit %}
-      <ul class="pager">
-        {% if page > 1 %}
-          <li class="previous"><a href="{{ url_for('user.reviews', user_id=user.id, page=page-1) }}">&larr; {{ _('Newer') }}</a></li>
-        {% endif %}
-        {% if page-1 < count//limit %}
-          <li class="next"><a href="{{ url_for('user.reviews', user_id=user.id, page=page+1) }}">{{ _('Older') }} &rarr;</a></li>
-        {% endif %}
-      </ul>
+      {{ display_pagination(page, (count/limit)|round(method='ceil')|int, 'user.reviews', {'user_id':user.id}) }}
     {% endif %}
   {% endif %}
 {% endblock %}
diff --git a/critiquebrainz/frontend/templates/work/entity.html b/critiquebrainz/frontend/templates/work/entity.html
index 981dd2fa6..84bb2206d 100644
--- a/critiquebrainz/frontend/templates/work/entity.html
+++ b/critiquebrainz/frontend/templates/work/entity.html
@@ -1,5 +1,5 @@
 {% extends 'base.html' %}
-{% from 'macros.html' import entity_rate_form, show_avg_rating with context %}
+{% from 'macros.html' import entity_rate_form, show_avg_rating, display_pagination with context %}
 {% from 'common.html' import rating_script with context %}
 
 {% block title %}{{ work.name }} - CritiqueBrainz{% endblock %}
@@ -99,16 +99,7 @@ <h4>{{ _('Recordings') }}</h4>
         </tbody>
       </table>
       {% if recording_count > recording_limit %}
-        <div class="col-md-12">
-          <ul class="pager">
-            {% if page > 1 %}
-              <li class="previous"><a href="{{ url_for('work.entity', id=id, page=page-1) }}">&larr; {{ _('Previous') }}</a></li>
-            {% endif %}
-            {% if page < recording_count//recording_limit %}
-              <li class="next"><a href="{{ url_for('work.entity', id=id, page=page+1) }}">{{ _('Next') }} &rarr;</a></li>
-            {% endif %}
-          </ul>
-        </div>
+        {{ display_pagination(page, (recording_count/recording_limit)|round(method='ceil')|int, 'work.entity', {'id':id}) }}
       {% endif %}
     {% endif %}
     <ul class="pagination"></ul>

From 8ecef690f0a967a8f8c3802d38a537395e360eef Mon Sep 17 00:00:00 2001
From: Ansh Goyal <anshg1214@gmail.com>
Date: Sat, 5 Feb 2022 12:03:00 +0530
Subject: [PATCH 6/7] Fix pagination

---
 critiquebrainz/frontend/templates/artist/entity.html   | 2 +-
 critiquebrainz/frontend/templates/macros.html          | 9 +++++----
 critiquebrainz/frontend/templates/mapping/spotify.html | 2 +-
 critiquebrainz/frontend/templates/review/browse.html   | 2 +-
 critiquebrainz/frontend/templates/user/reviews.html    | 2 +-
 critiquebrainz/frontend/templates/work/entity.html     | 2 +-
 6 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/critiquebrainz/frontend/templates/artist/entity.html b/critiquebrainz/frontend/templates/artist/entity.html
index 4aecc4620..32e8fc33c 100644
--- a/critiquebrainz/frontend/templates/artist/entity.html
+++ b/critiquebrainz/frontend/templates/artist/entity.html
@@ -148,7 +148,7 @@ <h4>{{ _('Discography') }}</h4>
         <div class="clearfix"></div>
 
         {% if release_group_count > release_groups_limit %}
-          {{ display_pagination(page, (release_group_count/release_groups_limit)|round(method='ceil')|int, 'artist.entity', {'id': id, 'release_type':release_type}) }}
+          {{ display_pagination(page, release_group_count, release_groups_limit, 'artist.entity', {'id': id, 'release_type':release_type}) }}
         {% endif %}
       </div>
     {% endif %}
diff --git a/critiquebrainz/frontend/templates/macros.html b/critiquebrainz/frontend/templates/macros.html
index 6c634fbf9..47a02d69c 100644
--- a/critiquebrainz/frontend/templates/macros.html
+++ b/critiquebrainz/frontend/templates/macros.html
@@ -221,7 +221,8 @@ <h4 style="margin-bottom:0;">{{ _('Rate this {}:'.format(entity_type_readable))
     {% endif %}
 {% endmacro %}
 
-{% macro display_pagination(current_page, total_pages, page_info, parameter) %}
+{% macro display_pagination(current_page, count, limit, page_info, parameter) %}
+  {% set total_pages = (count/limit)|round(method='ceil')|int %}
   <div class="col-md-12 text-center">
     <nav aria-label="Page navigation">
       <ul class="pagination">
@@ -235,7 +236,7 @@ <h4 style="margin-bottom:0;">{{ _('Rate this {}:'.format(entity_type_readable))
         {% endif %}
 
         {% if current_page == 5 %}
-          <li {{ "class=active" if current_page == 2 }}><a href="{{ url_for(page_info, page=2, **parameter) }}">{{ 2 }}</a></li>
+          <li><a href="{{ url_for(page_info, page=2, **parameter) }}">{{ 2 }}</a></li>
         {% endif %}
 
         {% for page_index in range([2,current_page-2]|max, [total_pages,current_page+3]|min) %}
@@ -243,7 +244,7 @@ <h4 style="margin-bottom:0;">{{ _('Rate this {}:'.format(entity_type_readable))
         {% endfor %}
 
         {% if current_page == (total_pages-4) %}
-          <li {{ "class=active" if current_page == total_pages-1 }}><a href="{{ url_for(page_info, page=(total_pages-1), **parameter) }}">{{ total_pages-1 }}</a></li>
+          <li><a href="{{ url_for(page_info, page=(total_pages-1), **parameter) }}">{{ total_pages-1 }}</a></li>
         {% endif %}
 
         {% if (current_page < (total_pages - 4)) %}
@@ -252,7 +253,7 @@ <h4 style="margin-bottom:0;">{{ _('Rate this {}:'.format(entity_type_readable))
 
         <li {{ "class=active" if current_page == total_pages }}><a href="{{ url_for(page_info, page=total_pages, **parameter) }}">{{ total_pages }}</a></li>
 
-        <li class="next {{'disabled' if current_page-1 >= count//limit }}"><a aria-label="Next" href="{{ url_for(page_info, page=page+1, **parameter) }}">{{ _('Next') }} &rarr;</a></li>
+        <li class="next {{'disabled' if (current_page-1) >= total_pages }}"><a aria-label="Next" href="{{ url_for(page_info, page=page+1, **parameter) }}">{{ _('Next') }} &rarr;</a></li>
       </ul>
     </nav>
   </div>
diff --git a/critiquebrainz/frontend/templates/mapping/spotify.html b/critiquebrainz/frontend/templates/mapping/spotify.html
index ec82aad90..24212c52c 100644
--- a/critiquebrainz/frontend/templates/mapping/spotify.html
+++ b/critiquebrainz/frontend/templates/mapping/spotify.html
@@ -47,7 +47,7 @@ <h2>{{ _('Spotify album mapping') }}</h2>
     {% endfor %}
   </div>
   {% if count > limit %}
-    {{ display_pagination(page, (count/limit)|round(method='ceil')|int, 'mapping.spotify_add', {'release_group_id':release_group.id}) }}
+    {{ display_pagination(page, count, limit, 'mapping.spotify_add', {'release_group_id':release_group.id}) }}
   {% endif %}
 {% else %}
   <p class="lead" style="text-align:center; margin-top:20px;">{{ _('No similar albums found') }}</p>
diff --git a/critiquebrainz/frontend/templates/review/browse.html b/critiquebrainz/frontend/templates/review/browse.html
index 1867d8294..da2b54a45 100644
--- a/critiquebrainz/frontend/templates/review/browse.html
+++ b/critiquebrainz/frontend/templates/review/browse.html
@@ -51,7 +51,7 @@ <h2>{{ _('Reviews') }}</h2>
 </div>
 
 {% if count > limit %}
-  {{ display_pagination(page, (count/limit)|round(method='ceil')|int, 'review.browse', {'entity_type':entity_type}) }}
+  {{ display_pagination(page, count, limit, 'review.browse', {'entity_type':entity_type}) }}
 {% endif %}
 
 {% endblock %}
diff --git a/critiquebrainz/frontend/templates/user/reviews.html b/critiquebrainz/frontend/templates/user/reviews.html
index 95af3ef83..492234347 100644
--- a/critiquebrainz/frontend/templates/user/reviews.html
+++ b/critiquebrainz/frontend/templates/user/reviews.html
@@ -125,7 +125,7 @@
     </table>
 
     {% if count > limit %}
-      {{ display_pagination(page, (count/limit)|round(method='ceil')|int, 'user.reviews', {'user_id':user.id}) }}
+      {{ display_pagination(page, count, limit, 'user.reviews', {'user_id':user.id}) }}
     {% endif %}
   {% endif %}
 {% endblock %}
diff --git a/critiquebrainz/frontend/templates/work/entity.html b/critiquebrainz/frontend/templates/work/entity.html
index 84bb2206d..dfd31add8 100644
--- a/critiquebrainz/frontend/templates/work/entity.html
+++ b/critiquebrainz/frontend/templates/work/entity.html
@@ -99,7 +99,7 @@ <h4>{{ _('Recordings') }}</h4>
         </tbody>
       </table>
       {% if recording_count > recording_limit %}
-        {{ display_pagination(page, (recording_count/recording_limit)|round(method='ceil')|int, 'work.entity', {'id':id}) }}
+        {{ display_pagination(page, recording_count, recording_limit, 'work.entity', {'id':id}) }}
       {% endif %}
     {% endif %}
     <ul class="pagination"></ul>

From a1cf7bf017d77b5c89237c16f117223188829c72 Mon Sep 17 00:00:00 2001
From: Ansh Goyal <anshg1214@gmail.com>
Date: Sun, 6 Feb 2022 22:02:18 +0530
Subject: [PATCH 7/7] add: pagination display condition in macros

---
 .../frontend/templates/artist/entity.html     |  4 +-
 critiquebrainz/frontend/templates/macros.html | 48 ++++++++-----------
 .../frontend/templates/mapping/spotify.html   |  4 +-
 .../frontend/templates/review/browse.html     |  4 +-
 .../frontend/templates/user/reviews.html      |  5 +-
 .../frontend/templates/work/entity.html       |  4 +-
 6 files changed, 27 insertions(+), 42 deletions(-)

diff --git a/critiquebrainz/frontend/templates/artist/entity.html b/critiquebrainz/frontend/templates/artist/entity.html
index 32e8fc33c..a23ab811c 100644
--- a/critiquebrainz/frontend/templates/artist/entity.html
+++ b/critiquebrainz/frontend/templates/artist/entity.html
@@ -147,9 +147,7 @@ <h4>{{ _('Discography') }}</h4>
         {% endfor %}
         <div class="clearfix"></div>
 
-        {% if release_group_count > release_groups_limit %}
-          {{ display_pagination(page, release_group_count, release_groups_limit, 'artist.entity', {'id': id, 'release_type':release_type}) }}
-        {% endif %}
+        {{ display_pagination(page, release_group_count, release_groups_limit, 'artist.entity', {'id': id, 'release_type':release_type}) }}
       </div>
     {% endif %}
     <ul class="pagination"></ul>
diff --git a/critiquebrainz/frontend/templates/macros.html b/critiquebrainz/frontend/templates/macros.html
index 47a02d69c..92c74bb96 100644
--- a/critiquebrainz/frontend/templates/macros.html
+++ b/critiquebrainz/frontend/templates/macros.html
@@ -223,38 +223,32 @@ <h4 style="margin-bottom:0;">{{ _('Rate this {}:'.format(entity_type_readable))
 
 {% macro display_pagination(current_page, count, limit, page_info, parameter) %}
   {% set total_pages = (count/limit)|round(method='ceil')|int %}
-  <div class="col-md-12 text-center">
-    <nav aria-label="Page navigation">
-      <ul class="pagination">
+  {% if count > limit %}
+    <div class="col-md-12 text-center">
+      <nav aria-label="Page navigation">
+        <ul class="pagination">
 
-        <li class="previous {{'disabled' if current_page <= 1 }}"><a aria-label="Previous" href="{{ url_for(page_info, page=page-1, **parameter) }}">&larr; {{ _('Previous') }}</a></li>
+          <li class="previous {{'disabled' if current_page <= 1 }}"><a aria-label="Previous" href="{{ url_for(page_info, page=page-1, **parameter) }}">&larr; {{ _('Previous') }}</a></li>
         
-        <li {{ "class=active" if current_page == 1 }}><a href="{{ url_for(page_info, page=1,  **parameter) }}">{{ 1 }}</a></li>
+          <li {{ "class=active" if current_page == 1 }}><a href="{{ url_for(page_info, page=1,  **parameter) }}">{{ 1 }}</a></li>
 
-        {% if current_page > 5 %}
-          <li class="disabled"><a>{{ '...' }}</a></li>
-        {% endif %}
+          {% if current_page >= 5 %}
+            <li class="disabled"><a>{{ '...' }}</a></li>
+          {% endif %}
 
-        {% if current_page == 5 %}
-          <li><a href="{{ url_for(page_info, page=2, **parameter) }}">{{ 2 }}</a></li>
-        {% endif %}
+          {% for page_index in range([2,current_page-2]|max, [total_pages,current_page+3]|min) %}
+            <li {{ "class=active" if current_page == page_index }}><a href="{{ url_for(page_info, page=page_index, **parameter) }}">{{ page_index }}</a></li>
+          {% endfor %}
 
-        {% for page_index in range([2,current_page-2]|max, [total_pages,current_page+3]|min) %}
-          <li {{ "class=active" if current_page == page_index }}><a href="{{ url_for(page_info, page=page_index, **parameter) }}">{{ page_index }}</a></li>
-        {% endfor %}
+          {% if (current_page <= (total_pages - 4)) %}
+            <li class='disabled'><a>{{ '...' }}</a></li>
+          {% endif %}
 
-        {% if current_page == (total_pages-4) %}
-          <li><a href="{{ url_for(page_info, page=(total_pages-1), **parameter) }}">{{ total_pages-1 }}</a></li>
-        {% endif %}
-
-        {% if (current_page < (total_pages - 4)) %}
-          <li class='disabled'><a>{{ '...' }}</a></li>
-        {% endif %}
+          <li {{ "class=active" if current_page == total_pages }}><a href="{{ url_for(page_info, page=total_pages, **parameter) }}">{{ total_pages }}</a></li>
 
-        <li {{ "class=active" if current_page == total_pages }}><a href="{{ url_for(page_info, page=total_pages, **parameter) }}">{{ total_pages }}</a></li>
-
-        <li class="next {{'disabled' if (current_page-1) >= total_pages }}"><a aria-label="Next" href="{{ url_for(page_info, page=page+1, **parameter) }}">{{ _('Next') }} &rarr;</a></li>
-      </ul>
-    </nav>
-  </div>
+          <li class="next {{'disabled' if current_page == total_pages }}"><a aria-label="Next" href="{{ url_for(page_info, page=page+1, **parameter) }}">{{ _('Next') }} &rarr;</a></li>
+        </ul>
+      </nav>
+    </div>
+  {% endif %}
 {% endmacro %}
\ No newline at end of file
diff --git a/critiquebrainz/frontend/templates/mapping/spotify.html b/critiquebrainz/frontend/templates/mapping/spotify.html
index 24212c52c..29a804d12 100644
--- a/critiquebrainz/frontend/templates/mapping/spotify.html
+++ b/critiquebrainz/frontend/templates/mapping/spotify.html
@@ -46,9 +46,7 @@ <h2>{{ _('Spotify album mapping') }}</h2>
     </div>
     {% endfor %}
   </div>
-  {% if count > limit %}
-    {{ display_pagination(page, count, limit, 'mapping.spotify_add', {'release_group_id':release_group.id}) }}
-  {% endif %}
+  {{ display_pagination(page, count, limit, 'mapping.spotify_add', {'release_group_id':release_group.id}) }}
 {% else %}
   <p class="lead" style="text-align:center; margin-top:20px;">{{ _('No similar albums found') }}</p>
 {% endif %}
diff --git a/critiquebrainz/frontend/templates/review/browse.html b/critiquebrainz/frontend/templates/review/browse.html
index da2b54a45..6b113359a 100644
--- a/critiquebrainz/frontend/templates/review/browse.html
+++ b/critiquebrainz/frontend/templates/review/browse.html
@@ -50,8 +50,6 @@ <h2>{{ _('Reviews') }}</h2>
 {% endif %}
 </div>
 
-{% if count > limit %}
-  {{ display_pagination(page, count, limit, 'review.browse', {'entity_type':entity_type}) }}
-{% endif %}
+{{ display_pagination(page, count, limit, 'review.browse', {'entity_type':entity_type}) }}
 
 {% endblock %}
diff --git a/critiquebrainz/frontend/templates/user/reviews.html b/critiquebrainz/frontend/templates/user/reviews.html
index 492234347..73b41f780 100644
--- a/critiquebrainz/frontend/templates/user/reviews.html
+++ b/critiquebrainz/frontend/templates/user/reviews.html
@@ -124,9 +124,8 @@
       </tbody>
     </table>
 
-    {% if count > limit %}
-      {{ display_pagination(page, count, limit, 'user.reviews', {'user_id':user.id}) }}
-    {% endif %}
+    {{ display_pagination(page, count, limit, 'user.reviews', {'user_id':user.id}) }}
+
   {% endif %}
 {% endblock %}
 
diff --git a/critiquebrainz/frontend/templates/work/entity.html b/critiquebrainz/frontend/templates/work/entity.html
index dfd31add8..60ea32ba6 100644
--- a/critiquebrainz/frontend/templates/work/entity.html
+++ b/critiquebrainz/frontend/templates/work/entity.html
@@ -98,9 +98,7 @@ <h4>{{ _('Recordings') }}</h4>
           {% endfor %}
         </tbody>
       </table>
-      {% if recording_count > recording_limit %}
-        {{ display_pagination(page, recording_count, recording_limit, 'work.entity', {'id':id}) }}
-      {% endif %}
+      {{ display_pagination(page, recording_count, recording_limit, 'work.entity', {'id':id}) }}
     {% endif %}
     <ul class="pagination"></ul>
   </div>