From 5c435b200672c63537d70e66db0090193942f081 Mon Sep 17 00:00:00 2001
From: Waruna Wickramasingha <waruna.wickramasingha@stfc.ac.uk>
Date: Fri, 5 Sep 2025 10:46:27 +0100
Subject: [PATCH 1/2] rebased to main

---
 web/requirements.txt |  4 ++--
 web/settings.py      |  3 +++
 web/urls.py          |  7 +++++--
 web/views.py         | 18 +++++++++++++++---
 4 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/web/requirements.txt b/web/requirements.txt
index 03afb7a..da7a778 100644
--- a/web/requirements.txt
+++ b/web/requirements.txt
@@ -1,5 +1,5 @@
-Django==5.0
-djangorestframework==3.16.0
+Django==5.1.10
+djangorestframework==3.16.1
 django-filter==25.1
 Markdown
 gunicorn
diff --git a/web/settings.py b/web/settings.py
index 771bbd5..e52f8e2 100644
--- a/web/settings.py
+++ b/web/settings.py
@@ -193,3 +193,6 @@
 
 # CSRF trusted origins
 CSRF_TRUSTED_ORIGINS = os.getenv("DJANGO_CSRF_TRUSTED_ORIGINS", "").split(",")
+
+# To direct django admin login into the built-in admin login page
+LOGIN_URL = '/admin/login/'
\ No newline at end of file
diff --git a/web/urls.py b/web/urls.py
index 784c649..0ca6ad1 100644
--- a/web/urls.py
+++ b/web/urls.py
@@ -2,6 +2,7 @@
 from django.contrib import admin
 from django.views.generic.base import RedirectView
 from django.urls import path
+from views import DRFLoginView
 
 admin.autodiscover()
 
@@ -10,6 +11,8 @@
     path("admin/", admin.site.urls),
     path("api/", include("services.urls")),
     # should be in services/urls.py
-    path("api-auth/", include("rest_framework.urls", namespace="rest_framework")),
-    path("", RedirectView.as_view(url="/api/", permanent=True)),
+    path('api-auth/login/', DRFLoginView.as_view(), name="rest_login"),
+    path('api-auth/', include('rest_framework.urls',
+                              namespace='rest_framework')),
+    path('', RedirectView.as_view(url='/api/', permanent=True))
 ]
diff --git a/web/views.py b/web/views.py
index 5487643..4728806 100644
--- a/web/views.py
+++ b/web/views.py
@@ -1,5 +1,17 @@
-from django.shortcuts import render_to_response
-
+from django.shortcuts import render
+from django.contrib.auth.views import LoginView
 
 def home(request):
-    return render_to_response("home/home.html")
+    return render(request, 'home/home.html')
+
+class DRFLoginView(LoginView):
+    template_name = "rest_framework/login.html"
+
+    def get(self, request, *args, **kwargs):
+        context = {
+            'form': self.get_form(),
+            'next': request.GET.get('next', ''),
+            'name': 'Login',
+            'code_style': 'friendly',
+        }
+        return render(request, self.template_name, context)

From de70250a28c362d06303daf8f4651e09428c5c28 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Fri, 5 Sep 2025 09:47:20 +0000
Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 web/settings.py |  2 +-
 web/urls.py     |  7 +++----
 web/views.py    | 12 +++++++-----
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/web/settings.py b/web/settings.py
index e52f8e2..a9e4e15 100644
--- a/web/settings.py
+++ b/web/settings.py
@@ -195,4 +195,4 @@
 CSRF_TRUSTED_ORIGINS = os.getenv("DJANGO_CSRF_TRUSTED_ORIGINS", "").split(",")
 
 # To direct django admin login into the built-in admin login page
-LOGIN_URL = '/admin/login/'
\ No newline at end of file
+LOGIN_URL = "/admin/login/"
diff --git a/web/urls.py b/web/urls.py
index 0ca6ad1..07b34d8 100644
--- a/web/urls.py
+++ b/web/urls.py
@@ -11,8 +11,7 @@
     path("admin/", admin.site.urls),
     path("api/", include("services.urls")),
     # should be in services/urls.py
-    path('api-auth/login/', DRFLoginView.as_view(), name="rest_login"),
-    path('api-auth/', include('rest_framework.urls',
-                              namespace='rest_framework')),
-    path('', RedirectView.as_view(url='/api/', permanent=True))
+    path("api-auth/login/", DRFLoginView.as_view(), name="rest_login"),
+    path("api-auth/", include("rest_framework.urls", namespace="rest_framework")),
+    path("", RedirectView.as_view(url="/api/", permanent=True)),
 ]
diff --git a/web/views.py b/web/views.py
index 4728806..f9a1b71 100644
--- a/web/views.py
+++ b/web/views.py
@@ -1,17 +1,19 @@
 from django.shortcuts import render
 from django.contrib.auth.views import LoginView
 
+
 def home(request):
-    return render(request, 'home/home.html')
+    return render(request, "home/home.html")
+
 
 class DRFLoginView(LoginView):
     template_name = "rest_framework/login.html"
 
     def get(self, request, *args, **kwargs):
         context = {
-            'form': self.get_form(),
-            'next': request.GET.get('next', ''),
-            'name': 'Login',
-            'code_style': 'friendly',
+            "form": self.get_form(),
+            "next": request.GET.get("next", ""),
+            "name": "Login",
+            "code_style": "friendly",
         }
         return render(request, self.template_name, context)