Merge remote-tracking branch 'origin/main' into 41-import-export-function

# Conflicts:
#	app/WYGIWYH/settings.py

app/WYGIWYH/settings.py

@@ -73,6 +73,7 @@ INSTALLED_APPS = [
     "apps.rules.apps.RulesConfig",
     "apps.calendar_view.apps.CalendarViewConfig",
     "apps.dca.apps.DcaConfig",
+    "pwa",
 ]
 
 MIDDLEWARE = [
@@ -337,5 +338,45 @@ else:
 
 CACHALOT_UNCACHABLE_TABLES = ("django_migrations", "procrastinate_jobs")
 
+
+# PWA
+PWA_APP_NAME = SITE_TITLE
+PWA_APP_DESCRIPTION = "A simple and powerful finance tracker"
+PWA_APP_THEME_COLOR = "#fbb700"
+PWA_APP_BACKGROUND_COLOR = "#222222"
+PWA_APP_DISPLAY = "standalone"
+PWA_APP_SCOPE = "/"
+PWA_APP_ORIENTATION = "any"
+PWA_APP_START_URL = "/"
+PWA_APP_STATUS_BAR_COLOR = "default"
+PWA_APP_ICONS = [
+    {"src": "/static/img/favicon/android-icon-192x192.png", "sizes": "192x192"}
+]
+PWA_APP_ICONS_APPLE = [
+    {"src": "/static/img/favicon/apple-icon-180x180.png", "sizes": "180x180"}
+]
+PWA_APP_SPLASH_SCREEN = [
+    {
+        "src": "/static/img/pwa/splash-640x1136.png",
+        "media": "(device-width: 320px) and (device-height: 568px) and (-webkit-device-pixel-ratio: 2)",
+    }
+]
+PWA_APP_DIR = "ltr"
+PWA_APP_LANG = "en-US"
+PWA_APP_SHORTCUTS = []
+PWA_APP_SCREENSHOTS = [
+    {
+        "src": "/static/img/pwa/splash-750x1334.png",
+        "sizes": "750x1334",
+        "type": "image/png",
+        "form_factor": "wide",
+    },
+    {
+        "src": "/static/img/pwa/splash-750x1334.png",
+        "sizes": "750x1334",
+        "type": "image/png",
+    },
+]
+
 ENABLE_SOFT_DELETE = os.getenv("ENABLE_SOFT_DELETION", "false").lower() == "true"
 KEEP_DELETED_TRANSACTIONS_FOR = int(os.getenv("KEEP_DELETED_ENTRIES_FOR", "365"))

app/WYGIWYH/urls.py

@@ -27,6 +27,7 @@ urlpatterns = [
     path("hijack/", include("hijack.urls")),
     path("__debug__/", include("debug_toolbar.urls")),
     path("__reload__/", include("django_browser_reload.urls")),
+    path("", include("pwa.urls")),
     # path("api/", include("rest_framework.urls")),
     path("api/", include("apps.api.urls")),
     path("api/schema/", SpectacularAPIView.as_view(), name="schema"),

app/static/img/favicon/manifest.json

@@ -1,41 +0,0 @@
-{
- "name": "WYGIWYH",
- "icons": [
-  {
-   "src": "\/static\/img\/favicon\/android-icon-36x36.png",
-   "sizes": "36x36",
-   "type": "image\/png",
-   "density": "0.75"
-  },
-  {
-   "src": "\/static\/img\/favicon\/android-icon-48x48.png",
-   "sizes": "48x48",
-   "type": "image\/png",
-   "density": "1.0"
-  },
-  {
-   "src": "\/static\/img\/favicon\/android-icon-72x72.png",
-   "sizes": "72x72",
-   "type": "image\/png",
-   "density": "1.5"
-  },
-  {
-   "src": "\/static\/img\/favicon\/android-icon-96x96.png",
-   "sizes": "96x96",
-   "type": "image\/png",
-   "density": "2.0"
-  },
-  {
-   "src": "\/static\/img\/favicon\/android-icon-144x144.png",
-   "sizes": "144x144",
-   "type": "image\/png",
-   "density": "3.0"
-  },
-  {
-   "src": "\/static\/img\/favicon\/android-icon-192x192.png",
-   "sizes": "192x192",
-   "type": "image\/png",
-   "density": "4.0"
-  }
- ]
-}

app/templates/includes/head/favicons.html

@@ -12,7 +12,6 @@
 <link rel="icon" type="image/png" sizes="32x32" href="{% static 'img/favicon/favicon-32x32.png' %}">
 <link rel="icon" type="image/png" sizes="96x96" href="{% static 'img/favicon/favicon-96x96.png' %}">
 <link rel="icon" type="image/png" sizes="16x16" href="{% static 'img/favicon/favicon-16x16.png' %}">
-<link rel="manifest" href="{% static 'img/favicon/manifest.json' %}">
 <meta name="msapplication-TileColor" content="#ffffff">
 <meta name="msapplication-TileImage" content="{% static 'img/favicon/ms-icon-144x144.png' %}">
-<meta name="theme-color" content="#ffffff">
+<meta name="theme-color" content="#ffffff">

app/templates/layouts/base.html

@@ -1,3 +1,4 @@
+{% load pwa %}
 {% load formats %}
 {% load i18n %}
 {% load title %}
@@ -15,6 +16,7 @@
     </title>
 
     {% include 'includes/head/favicons.html' %}
+    {% progressive_web_app_meta %}
 
     {% include 'includes/styles.html' %}
     {% block extra_styles %}{% endblock %}

app/templates/layouts/base_auth.html

@@ -1,3 +1,4 @@
+{% load pwa %}
 {% load title %}
 {% load webpack_loader %}
 <!doctype html>
@@ -11,8 +12,9 @@
         {% endblock title %}
       {% endfilter %}
     </title>
-  
+
     {% include 'includes/head/favicons.html' %}
+    {% progressive_web_app_meta %}
 
     {% include 'includes/styles.html' %}
     {% block extra_styles %}{% endblock %}

requirements.txt

@@ -9,7 +9,7 @@ django-filter==24.3
 django-debug-toolbar==4.3.0
 django-cachalot~=2.6.3
 django-cotton~=1.2.1
-
+django-pwa~=2.0.1
 djangorestframework~=3.15.2
 drf-spectacular~=0.27.2