{% if user.is_authenticated %}
diff --git a/allianceauth/middleware.py b/allianceauth/middleware.py
new file mode 100644
index 00000000..b73665c8
--- /dev/null
+++ b/allianceauth/middleware.py
@@ -0,0 +1,65 @@
+"""
+Alliance Auth Middleware
+"""
+
+from user_agents import parse
+
+
+class DeviceDetectionMiddleware:
+ """
+ Middleware to detect the type of device making the request.
+ Sets flags on the request object for easy access in views and templates.
+
+ Flags include:
+ - is_mobile: True if the device is a mobile phone.
+ - is_tablet: True if the device is a tablet.
+ - is_mobile_device: True if the device is either a mobile phone or a tablet.
+ - is_touch_capable: True if the device has touch capabilities.
+ - is_pc: True if the device is a desktop or laptop computer.
+ - is_bot: True if the device is identified as a bot or crawler.
+ """
+
+ def __init__(self, get_response):
+ """
+ Initialize the middleware with the get_response callable.
+
+ :param get_response:
+ :type get_response:
+ """
+
+ self.get_response = get_response
+
+ def __call__(self, request):
+ """
+ Process the incoming request to determine if it's from a mobile device.
+
+ This method is called when the middleware is invoked. It inspects the
+ `user-agent` header of the incoming HTTP request to determine the type
+ of client making the request (e.g., mobile, tablet, PC, bot, etc.).
+ Flags are set on the `request` object to indicate the client type.
+
+ :param request: The HTTP request object.
+ :type request: HttpRequest
+ :return: The HTTP response object after processing the request.
+ :rtype: HttpResponse
+ """
+
+ # Retrieve the user-agent string from the request headers
+ user_agent_string = request.headers.get("user-agent", "")
+
+ # Parse the user-agent string to extract client information
+ user_agent = parse(user_agent_string)
+
+ # Set flags on the request object based on the client type
+ request.is_mobile = user_agent.is_mobile # True if the client is a mobile phone
+ request.is_tablet = user_agent.is_tablet # True if the client is a tablet
+ request.is_mobile_device = user_agent.is_mobile or user_agent.is_tablet # True if mobile phone or tablet
+ request.is_touch_capable = user_agent.is_touch_capable # True if the client supports touch input
+ request.is_pc = user_agent.is_pc # True if the client is a PC
+ request.is_bot = user_agent.is_bot # True if the client is a bot
+
+ # Pass the request to the next middleware or view and get the response
+ response = self.get_response(request)
+
+ # Return the processed response
+ return response
diff --git a/allianceauth/project_template/project_name/settings/base.py b/allianceauth/project_template/project_name/settings/base.py
index 973b3bb5..75a76c2c 100644
--- a/allianceauth/project_template/project_name/settings/base.py
+++ b/allianceauth/project_template/project_name/settings/base.py
@@ -88,6 +88,7 @@ MIDDLEWARE = [
"django.middleware.security.SecurityMiddleware",
"django.contrib.sessions.middleware.SessionMiddleware",
"allianceauth.authentication.middleware.UserSettingsMiddleware",
+ "allianceauth.middleware.DeviceDetectionMiddleware",
"django.middleware.locale.LocaleMiddleware",
"django.middleware.common.CommonMiddleware",
"django.middleware.csrf.CsrfViewMiddleware",
diff --git a/allianceauth/static/allianceauth/js/sidebar-collapse.js b/allianceauth/static/allianceauth/js/sidebar-collapse.js
index 436dfdaa..1dc76f80 100644
--- a/allianceauth/static/allianceauth/js/sidebar-collapse.js
+++ b/allianceauth/static/allianceauth/js/sidebar-collapse.js
@@ -1,23 +1,6 @@
$(document).ready(() => {
'use strict';
- const sidebar = document.getElementById('sidebar');
- const sidebarKey = `sidebar_${sidebar.id}`;
-
- sidebar.addEventListener('shown.bs.collapse', (event) => {
- if (event.target.id === sidebar.id) {
- localStorage.removeItem(sidebarKey);
- }
- });
-
- sidebar.addEventListener('hidden.bs.collapse', (event) => {
- if (event.target.id === sidebar.id) {
- localStorage.setItem(sidebarKey, 'closed');
- }
- });
-
- sidebar.classList.toggle('show', localStorage.getItem(sidebarKey) !== 'closed');
-
const activeChildMenuItem = document.querySelector('ul#sidebar-menu ul.collapse a.active');
if (activeChildMenuItem) {
diff --git a/allianceauth/urls.py b/allianceauth/urls.py
index 71a43b26..6be0890d 100644
--- a/allianceauth/urls.py
+++ b/allianceauth/urls.py
@@ -80,7 +80,10 @@ urlpatterns = [
path('night/', views.NightModeRedirectView.as_view(), name='nightmode'),
# Theme Change
- path('theme/', views.ThemeRedirectView.as_view(), name='theme')
+ path('theme/', views.ThemeRedirectView.as_view(), name='theme'),
+
+ # Minimize Menu
+ path('minimize-sidebar/', views.MinimizeSidebarRedirectView.as_view(), name='minimize_sidebar')
]
url_hooks = get_hooks("url_hook")
diff --git a/allianceauth/views.py b/allianceauth/views.py
index 95550ed1..27f076cf 100644
--- a/allianceauth/views.py
+++ b/allianceauth/views.py
@@ -48,6 +48,29 @@ class ThemeRedirectView(View):
return HttpResponseRedirect(request.GET.get("next", "/"))
+class MinimizeSidebarRedirectView(View):
+ SESSION_VAR = "MINIMIZE_SIDEBAR"
+
+ def post(self, request, *args, **kwargs):
+ request.session[self.SESSION_VAR] = not self.minimize_sidebar_state(request)
+ if not request.user.is_anonymous:
+ try:
+ request.user.profile.minimize_sidebar = request.session[self.SESSION_VAR]
+ request.user.profile.save()
+ except Exception as e:
+ logger.exception(e)
+
+ return HttpResponseRedirect(request.GET.get("next", "/"))
+
+ @classmethod
+ def minimize_sidebar_state(cls, request):
+ try:
+ return request.session.get(cls.SESSION_VAR, False)
+ except AttributeError:
+ # Session is middleware
+ # Sometimes request wont have a session attribute
+ return False
+
# TODO: error views should be renamed to a proper function name when possible
diff --git a/pyproject.toml b/pyproject.toml
index ef3092c6..b48ad87d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -61,11 +61,14 @@ dependencies = [
"passlib",
"pydiscourse",
"python-slugify>=1.2",
+ "pyyaml",
"redis>=4",
"requests>=2.9.1",
"requests-oauthlib",
"semantic-version",
"slixmpp<1.9",
+ "ua-parser",
+ "user-agents",
]
optional-dependencies.docs = [
"myst-parser",