Moved internalportal to separate app

internalportal/apps.py

@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class InternalportalConfig(AppConfig):
+    default_auto_field = "django.db.models.BigAutoField"
+    name = "internalportal"

website/templates/website/internalportal.html → internalportal/templates/internalportal/internalportal.html

@@ -8,7 +8,6 @@
             <div class="row">
                 <div class="col s12">
                     <h4>{% trans "Internportal" %}</h4>
-                    <p>{{ greeting }}</p>
                 </div>
             </div>
         </div>

internalportal/urls.py

@@ -0,0 +1,9 @@
+from django.urls import path
+
+from . import views
+
+app_name = "internalportal"
+
+urlpatterns = [
+    path("", views.InternalPortalView.as_view(), name="internalportal"),
+]

internalportal/views.py

@@ -0,0 +1,33 @@
+from datetime import datetime
+
+from django.contrib.auth.mixins import PermissionRequiredMixin
+from django.views.generic import TemplateView
+
+from inventory.models.item_loan import ItemLoan
+from news.models import Article, Event
+
+
+class InternalPortalView(PermissionRequiredMixin, TemplateView):
+    template_name = "internalportal/internalportal.html"
+    permission_required = "userprofile.is_active_member"
+
+    def get_context_data(self, *args, **kwargs):
+        context = super().get_context_data(*args, **kwargs)
+
+        context["current_date"] = datetime.now()
+
+        # Find the 5 loan apps that have gone unapproved the longest
+        context["loan_app_list"] = ItemLoan.objects.filter(
+            approver__isnull=True,
+        ).order_by("-loan_from")[:5]
+
+        # Same as in the index view
+        context["event_list"] = Event.objects.filter(internal=True).order_by(
+            "-time_start"
+        )[:5]
+
+        context["article_list"] = Article.objects.filter(
+            internal=True, draft=False
+        ).order_by("-pub_date")[:5]
+
+        return context

website/settings.py

@@ -65,6 +65,7 @@
     "social_django",
     "inventory",
     "watchlist",
+    "internalportal",
     "projectarchive",
     "markdownx",
     "django_crontab",
@@ -343,17 +344,6 @@
     "DEFAULT_FILTER_BACKENDS": ("django_filters.rest_framework.DjangoFilterBackend",)
 }
 
-# Random greetings that are displayed to the user on the internalportal page
-# Just for fun. The user's first name is formatted in
-INTERNALPORTAL_GREETINGS = [
-    "Hei, {}",  # zzz
-    "Heisann, {}",  # zzzzzz
-    "Halla, {}",  # zzzzzzzzzzzzzzzzz
-    "Og et rungende tjo-bing til deg, {}!",  # real shit?
-    "Husket å skru av ovnen, {}?",
-    "Dette er en tilfeldig melding. Plukket tilfeldig, altså. Selve meldingen er ikke tilfeldig generert ved å drive å plukke bokstaver og sånt. Du skjønner hva jeg mener, {}.",
-    "Lorem ipsum dolor sit amet, consectetur adipiscing elit... Oi, vent, dette er jo i produksjon!",
-]
 #################################
 # Website-specific              #
 #################################

website/templates/website/header.html

@@ -146,7 +146,7 @@
                         </li>
                         {% if user.is_authenticated and perms.userprofile.is_active_member %}
                             <li>
-                                <a class="waves-effect" href="{% url 'internalportal' %}">
+                                <a class="waves-effect" href="{% url 'internalportal:internalportal' %}">
                                     <i class="material-icons">dashboard</i>{% trans "Internportal" %}
                                 </a>
                             </li>
@@ -230,7 +230,7 @@
                             </li>
                             {% if user.is_authenticated and perms.userprofile.is_active_member %}
                                 <li class="tooltipped" data-position="left" data-tooltip="{% trans "Dashbord for medlemmer av Hackerspace" %}">
-                                    <a href="{% url 'internalportal' %}">
+                                    <a href="{% url 'internalportal:internalportal' %}">
                                         <i class="material-icons small">dashboard</i>{% trans "Internportal" %}
                                     </a>
                                 </li>

website/urls.py

@@ -24,7 +24,6 @@
     AcceptTosView,
     AdminView,
     IndexView,
-    InternalPortalView,
     RuleDetailsView,
     RulesView,
 )
@@ -92,7 +91,7 @@
     ),
     path("inventory/", include("inventory.urls")),
     path("vaktliste/", include("watchlist.urls")),
-    path("internalportal/", InternalPortalView.as_view(), name="internalportal"),
+    path("internalportal/", include("internalportal.urls")),
     path("projectarchive/", include("projectarchive.urls"), name="projectarchive"),
     path("markdownx/", include("markdownx.urls")),
 ]

website/views.py

@@ -1,5 +1,4 @@
 from datetime import datetime
-from random import randint
 from urllib import parse as urlparse
 
 from django.contrib.auth.mixins import LoginRequiredMixin, PermissionRequiredMixin
@@ -11,12 +10,10 @@
 from applications.models import ApplicationPeriod
 from committees.models import Committee
 from door.models import DoorStatus
-from inventory.models.item_loan import ItemLoan
 from news.models import Article, Event
 from userprofile.models import Profile, TermsOfService
 
 from .models import Card, FaqQuestion, Rule
-from .settings import INTERNALPORTAL_GREETINGS
 
 
 class AcceptTosView(TemplateView):
@@ -257,43 +254,6 @@ def get_context_data(self, **kwargs):
         }
 
 
-class InternalPortalView(PermissionRequiredMixin, TemplateView):
-    template_name = "website/internalportal.html"
-    permission_required = "userprofile.is_active_member"
-
-    def get_context_data(self, *args, **kwargs):
-        context = super().get_context_data(*args, **kwargs)
-
-        context["current_date"] = datetime.now()
-
-        # Random greeting for the internalportal header banner. Just for fun
-        greeting = INTERNALPORTAL_GREETINGS[
-            randint(0, len(INTERNALPORTAL_GREETINGS) - 1)
-        ]
-        # cba doing a regex or some other fancy stuff to check if the string has formatting
-        # just break it till it works
-        try:
-            context["greeting"] = greeting.format(self.request.user.first_name)
-        except IndexError:
-            context["greeting"] = greeting
-
-        # Find the 5 loan apps that have gone unapproved the longest
-        context["loan_app_list"] = ItemLoan.objects.filter(
-            approver__isnull=True,
-        ).order_by("-loan_from")[:5]
-
-        # Same as in the index view
-        context["event_list"] = Event.objects.filter(internal=True).order_by(
-            "-time_start"
-        )[:5]
-
-        context["article_list"] = Article.objects.filter(
-            internal=True, draft=False
-        ).order_by("-pub_date")[:5]
-
-        return context
-
-
 def handler404(request, exception=None):
     return render(request, "website/404.html", status=404)