fix: remove bad static file reference

pepfar_mle/common/tests/test_views.py

@@ -0,0 +1,30 @@
+import pytest
+from django.core.exceptions import PermissionDenied
+from model_bakery import baker
+
+from pepfar_mle.common.views import HomeView
+
+pytestmark = pytest.mark.django_db
+
+
+def test_approved_mixin_approved_user(rf, django_user_model):
+    approved_user = baker.make(django_user_model, is_approved=True)
+    url = "/"
+    request = rf.get(url)
+    request.user = approved_user
+    view = HomeView()
+    view.setup(request)
+    view.dispatch(request)  # no error raised
+
+
+def test_approved_mixin_non_approved_authenticated_user(rf, django_user_model):
+    non_approved_user = baker.make(django_user_model, is_approved=False)
+    url = "/"
+    request = rf.get(url)
+    request.user = non_approved_user
+    view = HomeView()
+    view.setup(request)
+    with pytest.raises(PermissionDenied) as e:
+        view.dispatch(request)  # no error raised
+
+    assert "PermissionDenied" in str(e)

pepfar_mle/common/views.py

@@ -1,10 +1,17 @@
-from django.contrib.auth.mixins import LoginRequiredMixin
-from django.views.generic import TemplateView
+from django.contrib.auth.mixins import LoginRequiredMixin, UserPassesTestMixin
+from django.views.generic import TemplateView, View
 
 
-class HomeView(LoginRequiredMixin, TemplateView):
+class ApprovedMixin(UserPassesTestMixin, View):
+    permission_denied_message = "Your account is pending approval"
+
+    def test_func(self):
+        return self.request.user.is_authenticated and self.request.user.is_approved
+
+
+class HomeView(LoginRequiredMixin, ApprovedMixin, TemplateView):
     template_name = "pages/home.html"
 
 
-class AboutView(LoginRequiredMixin, TemplateView):
+class AboutView(LoginRequiredMixin, ApprovedMixin, TemplateView):
     template_name = "pages/about.html"

pepfar_mle/static/css/project.css

@@ -8664,16 +8664,16 @@ a.text-dark:hover, a.text-dark:focus {
   color: #b94a48; }
 
 .login-background-image {
-  background: url("../../static/images/doc_keyboard.png");
+  background: url("https://source.unsplash.com/NFvdKIhxYlU/600x800");
   background-position: center;
   background-size: cover; }
 
 .register-background-image {
-  background: url("../../static/images/doc_keyboard.png");
+  background: url("https://source.unsplash.com/NFvdKIhxYlU/600x800");
   background-position: center;
   background-size: cover; }
 
 .password-background-image {
-  background: url("../../static/images/doc_keyboard.png");
+  background: url("https://source.unsplash.com/NFvdKIhxYlU/600x800");
   background-position: center;
   background-size: cover; }

pepfar_mle/static/css/sb-admin-2.css

@@ -11229,7 +11229,7 @@ a:focus {
 }
 
 .bg-login-image {
-    background: url("static/images/doc_keyboard.png");
+    background: url("https://source.unsplash.com/NFvdKIhxYlU/600x800");
     background-position: center;
     background-size: cover;
 }

pepfar_mle/static/sass/_variables.scss

@@ -71,6 +71,6 @@ $transition-collapse: height .15s ease !default;
 $dropdown-font-size: 0.85rem !default;
 $dropdown-border-color: $border-color !default;
 // Images
-$login-image: 'static/images/doc_keyboard.png' !default;
-$register-image: 'https://source.unsplash.com/Mv9hjnEUHR4/600x800' !default;
+$login-image: 'https://source.unsplash.com/NFvdKIhxYlU/600x800' !default;
+$register-image: 'https://source.unsplash.com/NFvdKIhxYlU/600x800' !default;
 $password-image: 'https://source.unsplash.com/oWTW-jNGl9I/600x800' !default;

pepfar_mle/static/sass/project.scss

@@ -29,19 +29,19 @@ $red: #b94a48;
 }
 
 .login-background-image {
-    background: url("../../static/images/doc_keyboard.png");
+    background: url("https://source.unsplash.com/NFvdKIhxYlU/600x800");
     background-position: center;
     background-size: cover;
 }
 
 .register-background-image {
-    background: url("../../static/images/doc_keyboard.png");
+    background: url("https://source.unsplash.com/NFvdKIhxYlU/600x800");
     background-position: center;
     background-size: cover;
 }
 
 .password-background-image {
-    background: url("../../static/images/doc_keyboard.png");
+    background: url("https://source.unsplash.com/NFvdKIhxYlU/600x800");
     background-position: center;
     background-size: cover;
 }

pepfar_mle/utils/tests/test_storages.py

@@ -1,12 +1,13 @@
 import pytest
+from django.core.management import call_command
 from model_bakery import baker
 
 pytestmark = pytest.mark.django_db
 
 
 class TestStorages:
-    # def test_static_root_google_cloud_storage(self):
-    #     call_command("collectstatic", "--noinput")
+    def test_static_root_google_cloud_storage(self):
+        call_command("collectstatic", "--noinput")
 
     def test_media_root_google_cloud_storage(self):
         org = baker.make("common.Organisation")