Quick wins

pdfding/admin/templates/information.html

@@ -26,18 +26,6 @@
                     <span class="text-3xl">{{ current_version }}</span>
                 </div>
             </div>
-            {% if latest_version and current_version != 'UNKNOWN' and current_version != latest_version %}
-
-            <div class="lg:w-58 flex flex-col font-semibold border px-4 py-2 rounded-sm mt-5">
-                <span>New Version Available!</span>
-                <a href="https://github.com/mrmn2/PdfDing/releases"
-                   id="new_version"
-                   target="_blank"
-                   rel="noopener noreferrer"
-                   class="text-3xl text-primary">{{ latest_version }}
-                </a>
-            </div>
-            {% endif %}
         </div>
     </div>
 </div>

pdfding/admin/tests/test_views.py

@@ -1,5 +1,3 @@
-from unittest.mock import patch
-
 from admin.views import AdminMixin, OverviewMixin
 from django.contrib.auth.models import User
 from django.test import Client, TestCase
@@ -41,17 +39,15 @@ def test_filter_objects(self):
 
             self.assertEqual(user_emails, expected_result)
 
-    @patch('admin.views.get_latest_version', return_value='0.0.0')
-    def test_get_extra_context(self, mock_get_latest_version):
+    def test_get_extra_context(self):
         response = self.client.get(f'{reverse('user_overview')}?search=@a&tags=admin')
 
         generated_extra_context = OverviewMixin.get_extra_context(response.wsgi_request)
         expected_extra_context = {'search_query': '@a', 'tag_query': ['admin'], 'page': 'user_overview'}
 
         self.assertEqual(generated_extra_context, expected_extra_context)
 
-    @patch('admin.views.get_latest_version', return_value='0.0.0')
-    def test_get_extra_context_empty_queries(self, mock_get_latest_version):
+    def test_get_extra_context_empty_queries(self):
         response = self.client.get(reverse('user_overview'))
 
         generated_extra_context = OverviewMixin.get_extra_context(response.wsgi_request)
@@ -99,8 +95,7 @@ def test_adjust_admin_rights_no_htmx(self):
         response = self.client.post(reverse('admin_adjust_rights', kwargs={'identifier': self.user.id}))
         self.assertRedirects(response, reverse('user_overview'), status_code=302)
 
-    @patch('admin.views.get_latest_version', return_value='0.0.0')
-    def test_get_information(self, mock_get_latest_version):
+    def test_get_information(self):
         for i in range(1, 4):
             User.objects.create_user(username=f'user_{i}', password='12345', email=f'{i}_b@a.com')
 
@@ -109,4 +104,3 @@ def test_get_information(self, mock_get_latest_version):
         self.assertEqual(response.context['number_of_users'], 4)
         self.assertEqual(response.context['number_of_pdfs'], 0)
         self.assertEqual(response.context['current_version'], 'DEV')
-        self.assertEqual(response.context['latest_version'], '0.0.0')

pdfding/admin/views.py

@@ -1,4 +1,3 @@
-from admin.service import get_latest_version
 from base import base_views
 from django.conf import settings
 from django.contrib.auth.mixins import UserPassesTestMixin
@@ -136,13 +135,11 @@ def get(self, request: HttpRequest):
 
         number_of_users = User.objects.all().count()
         number_of_pdfs = Pdf.objects.all().count()
-        latest_version = get_latest_version()
 
         context = {
             'number_of_users': number_of_users,
             'number_of_pdfs': number_of_pdfs,
             'current_version': settings.VERSION,
-            'latest_version': latest_version,
         }
 
         return render(request, 'information.html', context=context)

pdfding/core/context_processors.py

@@ -10,5 +10,4 @@ def pdfding_context(request: HttpRequest):  # pragma: no cover
         'DEMO_MODE': settings.DEMO_MODE,
         'VERSION': settings.VERSION,
         'ALLOW_PDF_SUB_DIRECTORIES': settings.ALLOW_PDF_SUB_DIRECTORIES,
-        'SUPPORTER_EDITION': settings.SUPPORTER_EDITION,
     }

pdfding/core/settings/dev.py

@@ -32,8 +32,6 @@
 # SECURITY WARNING: keep the secret key used in production secret!
 SECRET_KEY = 'some_key'  # nosec B105
 
-SUPPORTER_EDITION = True
-
 ACCOUNT_EMAIL_VERIFICATION = 'optional'
 
 DEFAULT_FROM_EMAIL = 'info@localhost'

pdfding/core/settings/prod.py

@@ -1,7 +1,5 @@
 from os import environ
 
-from django.contrib.auth.hashers import check_password
-
 from .base import *  # noqa: F401 F403
 
 try:
@@ -195,15 +193,6 @@
 else:
     ALLOW_PDF_SUB_DIRECTORIES = False
 
-# supporter edition settings
-SUPPORTER_KEY_HASH = 'pbkdf2_sha256$1000000$supporter$ZHnPv0AcYm6ZV5Pcyw8ULh3C1Dd5EGD2XG49gWpeTns='
-SUPPORTER_KEY = environ.get('SUPPORTER_KEY', '')
-
-if check_password(SUPPORTER_KEY, SUPPORTER_KEY_HASH):
-    SUPPORTER_EDITION = True
-else:
-    SUPPORTER_EDITION = False
-
 # demo mode
 if environ.get('DEMO_MODE', 'FALSE') == 'TRUE':
     DEMO_MODE = True

pdfding/e2e/test_admin_e2e.py

@@ -1,7 +1,4 @@
-from unittest.mock import patch
-
 from django.contrib.auth.models import User
-from django.test import override_settings
 from django.urls import reverse
 from helpers import PdfDingE2ETestCase
 from pdf.models.pdf_models import Pdf
@@ -81,36 +78,6 @@ def test_load_next_page(self):
             expect(self.page.locator("#user-13")).to_contain_text('12@a.com')
             expect(self.page.locator("#next_page_2_toggle")).not_to_be_visible()
 
-    @patch('admin.views.get_latest_version', return_value='0.0.0')
-    def test_new_version_available(self, mock_get_latest_version):
-        with sync_playwright() as p:
-            self.open(reverse("instance_info"), p)
-
-            expect(self.page.locator("body")).to_contain_text("New Version Available!")
-            expect(self.page.locator("#new_version")).to_contain_text("0.0.0")
-
-    @patch('admin.views.get_latest_version', return_value='DEV')
-    def test_new_version_same(self, mock_get_latest_version):
-        with sync_playwright() as p:
-            self.open(reverse("instance_info"), p)
-
-            expect(self.page.locator("body")).not_to_contain_text("New Version Available!")
-
-    @patch('admin.views.get_latest_version', return_value='0.0.0')
-    @override_settings(VERSION='UNKNOWN')
-    def test_new_version_unknown(self, mock_get_latest_version):
-        with sync_playwright() as p:
-            self.open(reverse("instance_info"), p)
-
-            expect(self.page.locator("body")).not_to_contain_text("New Version Available!")
-
-    @patch('admin.views.get_latest_version', return_value='')
-    def test_new_version_empty(self, mock_get_latest_version):
-        with sync_playwright() as p:
-            self.open(reverse("instance_info"), p)
-
-            expect(self.page.locator("body")).not_to_contain_text("New Version Available!")
-
     def test_search_admin(self):
         with sync_playwright() as p:
             self.open(f"{reverse('user_overview')}?tags=admin", p)

pdfding/e2e/test_pdf_overview_e2e.py

@@ -1,4 +1,3 @@
-from datetime import datetime, timedelta, timezone
 from pathlib import Path
 from unittest.mock import patch
 
@@ -592,31 +591,3 @@ def test_progress_bar_off_settings(self):
         with sync_playwright() as p:
             self.open(reverse('pdf_overview'), p)
             expect(self.page.locator("#progressbar-1")).not_to_be_visible()
-
-    @override_settings(SUPPORTER_EDITION=False)
-    def test_nagging_modal_needs_nagging(self):
-        self.user.profile.last_time_nagged = datetime.now(tz=timezone.utc) - timedelta(weeks=9)
-        self.user.profile.save()
-
-        self.assertTrue(self.user.profile.needs_nagging)
-
-        with sync_playwright() as p:
-            self.open(reverse('pdf_overview'), p)
-            expect(self.page.locator("#nagging")).to_be_visible()
-
-            self.page.get_by_role("button", name="Leave me alone").click()
-            expect(self.page.locator("#nagging")).not_to_be_visible()
-
-        changed_user = User.objects.get(id=self.user.id)
-        self.assertFalse(changed_user.profile.needs_nagging)
-
-        with sync_playwright() as p:
-            # test opening again
-            self.open(reverse('pdf_overview'), p)
-            expect(self.page.locator("#nagging")).not_to_be_visible()
-
-    @override_settings(SUPPORTER_EDITION=True)
-    def test_nagging_modal_not_needs_nagging(self):
-        with sync_playwright() as p:
-            self.open(reverse('pdf_overview'), p)
-            expect(self.page.locator("#nagging")).not_to_be_visible()

pdfding/e2e/test_users_e2e.py

@@ -308,26 +308,8 @@ def test_login_demo_mode(self, mock_uuid4, mock_create_demo_user):
 
 
 class EditionE2ETestCase(PdfDingE2ETestCase):
-    @override_settings(SUPPORTER_EDITION=True)
-    def test_supporter_edition_sidebar(self):
-        with sync_playwright() as p:
-            self.open(reverse('home'), p)
-            expect(self.page.locator("#sponsor")).not_to_be_visible()
-            expect(self.page.locator("#demo_mode")).not_to_be_visible()
-            expect(self.page.locator("#supporter")).to_be_visible()
-
-    @override_settings(SUPPORTER_EDITION=False, DEMO_MODE=False)
-    def test_not_supporter_edition_sidebar(self):
-        with sync_playwright() as p:
-            self.open(reverse('home'), p)
-            expect(self.page.locator("#sponsor")).to_be_visible()
-            expect(self.page.locator("#demo_mode")).not_to_be_visible()
-            expect(self.page.locator("#supporter")).not_to_be_visible()
-
     @override_settings(SUPPORTER_EDITION=False, DEMO_MODE=True)
     def test_demo_mode_sidebar(self):
         with sync_playwright() as p:
             self.open(reverse('home'), p)
-            expect(self.page.locator("#sponsor")).not_to_be_visible()
             expect(self.page.locator("#demo_mode")).to_be_visible()
-            expect(self.page.locator("#supporter")).not_to_be_visible()

pdfding/pdf/templates/pdf_overview.html

@@ -2,10 +2,10 @@
 
 {% block content %}
 <div class=""
-     x-data="{ show_tag_name_modal: false, show_preview_modal: false, show_delete_pdf_modal: false {% if needs_nagging %}, show_nagging_modal: true {% endif %}}"
+     x-data="{ show_tag_name_modal: false, show_preview_modal: false, show_delete_pdf_modal: false }"
      >
     <div class="flex flex-col md:flex-row md:justify-start"
-         :class="{ 'opacity-15': show_tag_name_modal || show_preview_modal || show_delete_pdf_modal {% if needs_nagging %}|| show_nagging_modal {% endif %}}">
+         :class="{ 'opacity-15': show_tag_name_modal || show_preview_modal || show_delete_pdf_modal }">
         <div class="w-full! md:w-72! lg:w-72! px-2 md:px-4 pt-2">
           {% include 'includes/sidebar.html' %}
         </div>
@@ -57,9 +57,6 @@
          class="fixed inset-x-0 top-40 mx-auto my-auto w-80! lg:w-[28rem]! z-20">
         <div id="delete_pdf_modal"></div>
     </div>
-    {% if needs_nagging %}
-    {% include 'includes/pdf_overview/nagging.html' %}
-    {% endif %}
 </div>
 
 {% endblock %}