feat: auto-refresh overview and networth pages (10m for overview and 1h for networth)

Useful if you want to leave WYGIWYH open in a fixed tab

.env.example

@@ -31,3 +31,10 @@ ENABLE_SOFT_DELETE=false
 KEEP_DELETED_TRANSACTIONS_FOR=365
 
 TASK_WORKERS=1 # This only work if you're using the single container option. Increase to have more open queues via procrastinate, you probably don't need to increase this.
+
+# OIDC Configuration. Uncomment the lines below if you want to add OIDC login to your instance
+#OIDC_CLIENT_NAME=""
+#OIDC_CLIENT_ID=""
+#OIDC_CLIENT_SECRET=""
+#OIDC_SERVER_URL=""
+#OIDC_ALLOW_SIGNUP=true

README.md

@@ -144,6 +144,31 @@ To create the first user, open the container's console using Unraid's UI, by cli
 | ADMIN_EMAIL                   | string         | None                              | Automatically creates an admin account with this email. Must have `ADMIN_PASSWORD` also set.                                                                                                                                             |
 | ADMIN_PASSWORD                | string         | None                              | Automatically creates an admin account with this password. Must have `ADMIN_EMAIL` also set.                                                                                                                                             |
 
+## OIDC Configuration
+
+WYGIWYH supports login via OpenID Connect (OIDC) through `django-allauth`. This allows users to authenticate using an external OIDC provider.
+
+> [!NOTE]
+> Currently only OpenID Connect is supported as a provider, open an issue if you need something else.
+
+To configure OIDC, you need to set the following environment variables:
+
+| Variable             | Description                                                                                                                                                                                                                                            |
+|----------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `OIDC_CLIENT_NAME`   | The name of the provider. will be displayed in the login page. Defaults to `OpenID Connect`                                                                                                                                                            |
+| `OIDC_CLIENT_ID`     | The Client ID provided by your OIDC provider.                                                                                                                                                                                                          |
+| `OIDC_CLIENT_SECRET` | The Client Secret provided by your OIDC provider.                                                                                                                                                                                                      |
+| `OIDC_SERVER_URL`    | The base URL of your OIDC provider's discovery document or authorization server (e.g., `https://your-provider.com/auth/realms/your-realm`). `django-allauth` will use this to discover the necessary endpoints (authorization, token, userinfo, etc.). |
+| `OIDC_ALLOW_SIGNUP`  | Allow the automatic creation of inexistent accounts on a successfull authentication. Defaults to `true`.                                                                                                                                               |
+
+**Callback URL (Redirect URI):**
+
+When configuring your OIDC provider, you will need to provide a callback URL (also known as a Redirect URI). For WYGIWYH, the default callback URL is:
+
+`https://your.wygiwyh.domain/auth/oidc/<OIDC_CLIENT_NAME>/login/callback/`
+
+Replace `https://your.wygiwyh.domain` with the actual URL where your WYGIWYH instance is accessible. And `<OIDC_CLIENT_NAME>` with the slugfied value set in OIDC_CLIENT_NAME or the default `openid-connect` if you haven't set this variable.
+
 # How it works
 
 Check out our [Wiki](https://github.com/eitchtee/WYGIWYH/wiki) for more information.

app/WYGIWYH/settings.py

@@ -14,6 +14,7 @@ import os
 import sys
 from pathlib import Path
 
+from django.utils.text import slugify
 
 SITE_TITLE = "WYGIWYH"
 TITLE_SEPARATOR = "::"
@@ -42,6 +43,7 @@ INSTALLED_APPS = [
     "django.contrib.contenttypes",
     "django.contrib.sessions",
     "django.contrib.messages",
+    "django.contrib.sites",
     "whitenoise.runserver_nostatic",
     "django.contrib.staticfiles",
     "webpack_boilerplate",
@@ -61,7 +63,6 @@ INSTALLED_APPS = [
     "apps.transactions.apps.TransactionsConfig",
     "apps.currencies.apps.CurrenciesConfig",
     "apps.accounts.apps.AccountsConfig",
-    "apps.common.apps.CommonConfig",
     "apps.net_worth.apps.NetWorthConfig",
     "apps.import_app.apps.ImportConfig",
     "apps.export_app.apps.ExportConfig",
@@ -74,8 +75,15 @@ INSTALLED_APPS = [
     "apps.calendar_view.apps.CalendarViewConfig",
     "apps.dca.apps.DcaConfig",
     "pwa",
+    "allauth",
+    "allauth.account",
+    "allauth.socialaccount",
+    "allauth.socialaccount.providers.openid_connect",
+    "apps.common.apps.CommonConfig",
 ]
 
+SITE_ID = 1
+
 MIDDLEWARE = [
     "django_browser_reload.middleware.BrowserReloadMiddleware",
     "apps.common.middleware.thread_local.ThreadLocalMiddleware",
@@ -91,6 +99,7 @@ MIDDLEWARE = [
     "django.contrib.messages.middleware.MessageMiddleware",
     "django.middleware.clickjacking.XFrameOptionsMiddleware",
     "hijack.middleware.HijackUserMiddleware",
+    "allauth.account.middleware.AccountMiddleware",
 ]
 
 ROOT_URLCONF = "WYGIWYH.urls"
@@ -307,6 +316,42 @@ DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
 
 LOGIN_REDIRECT_URL = "/"
 LOGIN_URL = "/login/"
+LOGOUT_REDIRECT_URL = "/login/"
+
+# Allauth settings
+AUTHENTICATION_BACKENDS = [
+    "django.contrib.auth.backends.ModelBackend",  # Keep default
+    "allauth.account.auth_backends.AuthenticationBackend",
+]
+
+SOCIALACCOUNT_PROVIDERS = {"openid_connect": {"APPS": []}}
+
+if (
+    os.getenv("OIDC_CLIENT_ID")
+    and os.getenv("OIDC_CLIENT_SECRET")
+    and os.getenv("OIDC_SERVER_URL")
+):
+    SOCIALACCOUNT_PROVIDERS["openid_connect"]["APPS"].append(
+        {
+            "provider_id": slugify(os.getenv("OIDC_CLIENT_NAME", "OpenID Connect")),
+            "name": os.getenv("OIDC_CLIENT_NAME", "OpenID Connect"),
+            "client_id": os.getenv("OIDC_CLIENT_ID"),
+            "secret": os.getenv("OIDC_CLIENT_SECRET"),
+            "settings": {
+                "server_url": os.getenv("OIDC_SERVER_URL"),
+            },
+        }
+    )
+
+ACCOUNT_LOGIN_METHODS = {"email"}
+ACCOUNT_SIGNUP_FIELDS = ["email*", "password1*", "password2*"]
+ACCOUNT_USER_MODEL_USERNAME_FIELD = None
+ACCOUNT_EMAIL_VERIFICATION = "none"
+SOCIALACCOUNT_LOGIN_ON_GET = True
+SOCIALACCOUNT_ONLY = True
+SOCIALACCOUNT_AUTO_SIGNUP = os.getenv("OIDC_ALLOW_SIGNUP", "true").lower() == "true"
+ACCOUNT_ADAPTER = "allauth.account.adapter.DefaultAccountAdapter"
+SOCIALACCOUNT_ADAPTER = "allauth.socialaccount.adapter.DefaultSocialAccountAdapter"
 
 # CRISPY FORMS
 CRISPY_ALLOWED_TEMPLATE_PACKS = ["bootstrap5", "crispy_forms/pure_text"]

app/WYGIWYH/urls.py

@@ -21,6 +21,8 @@ from drf_spectacular.views import (
     SpectacularAPIView,
     SpectacularSwaggerView,
 )
+from allauth.socialaccount.providers.openid_connect.views import login, callback
+
 
 urlpatterns = [
     path("admin/", admin.site.urls),
@@ -36,6 +38,13 @@ urlpatterns = [
         SpectacularSwaggerView.as_view(url_name="schema"),
         name="swagger-ui",
     ),
+    path("auth/", include("allauth.urls")),  # allauth urls
+    # path("auth/oidc/<str:provider_id>/login/", login, name="openid_connect_login"),
+    # path(
+    #     "auth/oidc/<str:provider_id>/login/callback/",
+    #     callback,
+    #     name="openid_connect_callback",
+    # ),
     path("", include("apps.transactions.urls")),
     path("", include("apps.common.urls")),
     path("", include("apps.users.urls")),

app/apps/accounts/tests.py

@@ -1,118 +1,33 @@
-from django.test import TestCase, Client
-from django.urls import reverse
-from django.contrib.auth import get_user_model
-from django.core.exceptions import ValidationError
-
+from django.test import TestCase
 
 from apps.accounts.models import Account, AccountGroup
 from apps.currencies.models import Currency
-from apps.common.models import SharedObject
-
-User = get_user_model()
 
 
-class BaseAccountAppTest(TestCase):
+class AccountTests(TestCase):
     def setUp(self):
-        self.user = User.objects.create_user(
-            email="accuser@example.com", password="password"
+        """Set up test data"""
+        self.currency = Currency.objects.create(
+            code="USD", name="US Dollar", decimal_places=2, prefix="$ "
         )
-        self.other_user = User.objects.create_user(
-            email="otheraccuser@example.com", password="password"
-        )
-        self.client = Client()
-        self.client.login(email="accuser@example.com", password="password")
-
-        self.currency_usd = Currency.objects.create(
-            code="USD", name="US Dollar", decimal_places=2, prefix="$"
-        )
-        self.currency_eur = Currency.objects.create(
-            code="EUR", name="Euro", decimal_places=2, prefix="€"
-        )
-
-
-class AccountGroupModelTests(BaseAccountAppTest):
-    def test_account_group_creation(self):
-        group = AccountGroup.objects.create(name="My Savings", owner=self.user)
-        self.assertEqual(str(group), "My Savings")
-        self.assertEqual(group.owner, self.user)
-
-    def test_account_group_unique_together_owner_name(self):
-        AccountGroup.objects.create(name="Unique Group", owner=self.user)
-        with self.assertRaises(Exception):  # IntegrityError at DB level
-            AccountGroup.objects.create(name="Unique Group", owner=self.user)
-
-
-class AccountGroupViewTests(BaseAccountAppTest):
-    def test_account_groups_list_view(self):
-        AccountGroup.objects.create(name="Group 1", owner=self.user)
-        AccountGroup.objects.create(
-            name="Group 2 Public", visibility=SharedObject.Visibility.public
-        )
-        response = self.client.get(reverse("account_groups_list"))
-        self.assertEqual(response.status_code, 200)
-        self.assertContains(response, "Group 1")
-        self.assertContains(response, "Group 2 Public")
-
-    def test_account_group_add_view(self):
-        response = self.client.post(
-            reverse("account_group_add"), {"name": "New Group from View"}
-        )
-        self.assertEqual(response.status_code, 204)  # HTMX success
-        self.assertTrue(
-            AccountGroup.objects.filter(
-                name="New Group from View", owner=self.user
-            ).exists()
-        )
-
-    def test_account_group_edit_view(self):
-        group = AccountGroup.objects.create(name="Original Group Name", owner=self.user)
-        response = self.client.post(
-            reverse("account_group_edit", args=[group.id]),
-            {"name": "Edited Group Name"},
-        )
-        self.assertEqual(response.status_code, 204)
-        group.refresh_from_db()
-        self.assertEqual(group.name, "Edited Group Name")
-
-    def test_account_group_delete_view(self):
-        group = AccountGroup.objects.create(name="Group to Delete", owner=self.user)
-        response = self.client.delete(reverse("account_group_delete", args=[group.id]))
-        self.assertEqual(response.status_code, 204)
-        self.assertFalse(AccountGroup.objects.filter(id=group.id).exists())
-
-    def test_other_user_cannot_edit_account_group(self):
-        group = AccountGroup.objects.create(name="User1s Group", owner=self.user)
-        self.client.logout()
-        self.client.login(email="otheraccuser@example.com", password="password")
-        response = self.client.post(
-            reverse("account_group_edit", args=[group.id]), {"name": "Attempted Edit"}
-        )
-        self.assertEqual(response.status_code, 204)  # View returns 204 with message
-        group.refresh_from_db()
-        self.assertEqual(group.name, "User1s Group")  # Name should not change
-
-
-class AccountModelTests(BaseAccountAppTest):  # Renamed from AccountTests
-    def setUp(self):
-        super().setUp()
-        self.account_group = AccountGroup.objects.create(
-            name="Test Group", owner=self.user
+        self.exchange_currency = Currency.objects.create(
+            code="EUR", name="Euro", decimal_places=2, prefix="€ "
         )
+        self.account_group = AccountGroup.objects.create(name="Test Group")
 
     def test_account_creation(self):
         """Test basic account creation"""
         account = Account.objects.create(
             name="Test Account",
             group=self.account_group,
-            currency=self.currency_usd,
-            owner=self.user,
+            currency=self.currency,
             is_asset=False,
             is_archived=False,
         )
         self.assertEqual(str(account), "Test Account")
+        self.assertEqual(account.name, "Test Account")
         self.assertEqual(account.group, self.account_group)
-        self.assertEqual(account.currency, self.currency_usd)
-        self.assertEqual(account.owner, self.user)
+        self.assertEqual(account.currency, self.currency)
         self.assertFalse(account.is_asset)
         self.assertFalse(account.is_archived)
 
@@ -120,170 +35,7 @@ class AccountModelTests(BaseAccountAppTest):  # Renamed from AccountTests
         """Test account creation with exchange currency"""
         account = Account.objects.create(
             name="Exchange Account",
-            currency=self.currency_usd,
-            exchange_currency=self.currency_eur,
-            owner=self.user,
+            currency=self.currency,
+            exchange_currency=self.exchange_currency,
         )
-        self.assertEqual(account.exchange_currency, self.currency_eur)
-
-    def test_account_clean_exchange_currency_same_as_currency(self):
-        account = Account(
-            name="Same Currency Account",
-            currency=self.currency_usd,
-            exchange_currency=self.currency_usd,  # Same as main currency
-            owner=self.user,
-        )
-        with self.assertRaises(ValidationError) as context:
-            account.full_clean()
-        self.assertIn("exchange_currency", context.exception.message_dict)
-        self.assertIn(
-            "Exchange currency cannot be the same as the account's main currency.",
-            context.exception.message_dict["exchange_currency"],
-        )
-
-    def test_account_unique_together_owner_name(self):
-        Account.objects.create(
-            name="Unique Account", owner=self.user, currency=self.currency_usd
-        )
-        with self.assertRaises(Exception):  # IntegrityError at DB level
-            Account.objects.create(
-                name="Unique Account", owner=self.user, currency=self.currency_eur
-            )
-
-
-class AccountViewTests(BaseAccountAppTest):
-    def setUp(self):
-        super().setUp()
-        self.account_group = AccountGroup.objects.create(
-            name="View Test Group", owner=self.user
-        )
-
-    def test_accounts_list_view(self):
-        Account.objects.create(
-            name="Acc 1",
-            currency=self.currency_usd,
-            owner=self.user,
-            group=self.account_group,
-        )
-        Account.objects.create(
-            name="Acc 2 Public",
-            currency=self.currency_eur,
-            visibility=SharedObject.Visibility.public,
-        )
-        response = self.client.get(reverse("accounts_list"))
-        self.assertEqual(response.status_code, 200)
-        self.assertContains(response, "Acc 1")
-        self.assertContains(response, "Acc 2 Public")
-
-    def test_account_add_view(self):
-        data = {
-            "name": "New Checking Account",
-            "group": self.account_group.id,
-            "currency": self.currency_usd.id,
-            "is_asset": "on",  # Checkbox data
-            "is_archived": "",  # Not checked
-        }
-        response = self.client.post(reverse("account_add"), data)
-        self.assertEqual(response.status_code, 204)  # HTMX success
-        self.assertTrue(
-            Account.objects.filter(
-                name="New Checking Account",
-                owner=self.user,
-                is_asset=True,
-                is_archived=False,
-            ).exists()
-        )
-
-    def test_account_edit_view(self):
-        account = Account.objects.create(
-            name="Original Account Name",
-            currency=self.currency_usd,
-            owner=self.user,
-            group=self.account_group,
-        )
-        data = {
-            "name": "Edited Account Name",
-            "group": self.account_group.id,
-            "currency": self.currency_usd.id,
-            "is_asset": "",  # Uncheck asset
-            "is_archived": "on",  # Check archived
-        }
-        response = self.client.post(reverse("account_edit", args=[account.id]), data)
-        self.assertEqual(response.status_code, 204)
-        account.refresh_from_db()
-        self.assertEqual(account.name, "Edited Account Name")
-        self.assertFalse(account.is_asset)
-        self.assertTrue(account.is_archived)
-
-    def test_account_delete_view(self):
-        account = Account.objects.create(
-            name="Account to Delete", currency=self.currency_usd, owner=self.user
-        )
-        response = self.client.delete(reverse("account_delete", args=[account.id]))
-        self.assertEqual(response.status_code, 204)
-        self.assertFalse(Account.objects.filter(id=account.id).exists())
-
-    def test_other_user_cannot_edit_account(self):
-        account = Account.objects.create(
-            name="User1s Account", currency=self.currency_usd, owner=self.user
-        )
-        self.client.logout()
-        self.client.login(email="otheraccuser@example.com", password="password")
-        data = {
-            "name": "Attempted Edit by Other",
-            "currency": self.currency_usd.id,
-        }  # Need currency
-        response = self.client.post(reverse("account_edit", args=[account.id]), data)
-        self.assertEqual(response.status_code, 204)  # View returns 204 with message
-        account.refresh_from_db()
-        self.assertEqual(account.name, "User1s Account")
-
-    def test_account_sharing_and_take_ownership(self):
-        # Create a public account by user1
-        public_account = Account.objects.create(
-            name="Public Account",
-            currency=self.currency_usd,
-            owner=self.user,
-            visibility=SharedObject.Visibility.public,
-        )
-        # Login as other_user
-        self.client.logout()
-        self.client.login(email="otheraccuser@example.com", password="password")
-
-        # other_user takes ownership
-        response = self.client.get(
-            reverse("account_take_ownership", args=[public_account.id])
-        )
-        self.assertEqual(response.status_code, 204)
-        public_account.refresh_from_db()
-        self.assertEqual(public_account.owner, self.other_user)
-        self.assertEqual(
-            public_account.visibility, SharedObject.Visibility.private
-        )  # Should become private
-
-        # Now, original user (self.user) should not be able to edit it
-        self.client.logout()
-        self.client.login(email="accuser@example.com", password="password")
-        response = self.client.post(
-            reverse("account_edit", args=[public_account.id]),
-            {"name": "Attempt by Original Owner", "currency": self.currency_usd.id},
-        )
-        self.assertEqual(response.status_code, 204)  # error message, no change
-        public_account.refresh_from_db()
-        self.assertNotEqual(public_account.name, "Attempt by Original Owner")
-
-    def test_account_share_view(self):
-        account_to_share = Account.objects.create(
-            name="Shareable Account", currency=self.currency_usd, owner=self.user
-        )
-        data = {
-            "shared_with": [self.other_user.id],
-            "visibility": SharedObject.Visibility.private,
-        }
-        response = self.client.post(
-            reverse("account_share", args=[account_to_share.id]), data
-        )
-        self.assertEqual(response.status_code, 204)
-        account_to_share.refresh_from_db()
-        self.assertIn(self.other_user, account_to_share.shared_with.all())
-        self.assertEqual(account_to_share.visibility, SharedObject.Visibility.private)
+        self.assertEqual(account.exchange_currency, self.exchange_currency)

app/apps/api/tests.py

@@ -1,306 +0,0 @@
-from decimal import Decimal
-from datetime import date, datetime
-from unittest.mock import patch
-
-from django.urls import reverse
-from django.contrib.auth import get_user_model
-from django.conf import settings
-from rest_framework.test import (
-    APIClient,
-    APITestCase,
-)  # APITestCase handles DB setup better for API tests
-from rest_framework import status
-
-from apps.accounts.models import Account, AccountGroup
-from apps.currencies.models import Currency
-from apps.transactions.models import (
-    Transaction,
-    TransactionCategory,
-    TransactionTag,
-    TransactionEntity,
-)
-
-# Assuming thread_local is used for setting user for serializers if they auto-assign owner
-from apps.common.middleware.thread_local import write_current_user
-
-User = get_user_model()
-
-
-class BaseAPITestCase(APITestCase):  # Use APITestCase for DRF tests
-    @classmethod
-    def setUpTestData(cls):
-        cls.user = User.objects.create_user(
-            email="apiuser@example.com", password="password"
-        )
-        cls.superuser = User.objects.create_superuser(
-            email="apisuper@example.com", password="password"
-        )
-
-        cls.currency_usd = Currency.objects.create(
-            code="USD", name="US Dollar API", decimal_places=2
-        )
-        cls.account_group_api = AccountGroup.objects.create(
-            name="API Group", owner=cls.user
-        )
-        cls.account_usd_api = Account.objects.create(
-            name="API Checking USD",
-            currency=cls.currency_usd,
-            owner=cls.user,
-            group=cls.account_group_api,
-        )
-        cls.category_api = TransactionCategory.objects.create(
-            name="API Food", owner=cls.user
-        )
-        cls.tag_api = TransactionTag.objects.create(name="API Urgent", owner=cls.user)
-        cls.entity_api = TransactionEntity.objects.create(
-            name="API Store", owner=cls.user
-        )
-
-    def setUp(self):
-        self.client = APIClient()
-        # Authenticate as regular user by default, can be overridden in tests
-        self.client.force_authenticate(user=self.user)
-        write_current_user(
-            self.user
-        )  # For serializers/models that might use get_current_user
-
-    def tearDown(self):
-        write_current_user(None)
-
-
-class TransactionAPITests(BaseAPITestCase):
-    def test_list_transactions(self):
-        # Create a transaction for the authenticated user
-        Transaction.objects.create(
-            account=self.account_usd_api,
-            owner=self.user,
-            type=Transaction.Type.EXPENSE,
-            date=date(2023, 1, 1),
-            amount=Decimal("10.00"),
-            description="Test List",
-        )
-        url = reverse("transaction-list")  # DRF default router name
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertEqual(response.data["pagination"]["count"], 1)
-        self.assertEqual(response.data["results"][0]["description"], "Test List")
-
-    def test_retrieve_transaction(self):
-        t = Transaction.objects.create(
-            account=self.account_usd_api,
-            owner=self.user,
-            type=Transaction.Type.INCOME,
-            date=date(2023, 2, 1),
-            amount=Decimal("100.00"),
-            description="Specific Salary",
-        )
-        url = reverse("transaction-detail", kwargs={"pk": t.pk})
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertEqual(response.data["description"], "Specific Salary")
-        self.assertIn(
-            "exchanged_amount", response.data
-        )  # Check for SerializerMethodField
-
-    @patch("apps.transactions.signals.transaction_created.send")
-    def test_create_transaction(self, mock_signal_send):
-        url = reverse("transaction-list")
-        data = {
-            "account_id": self.account_usd_api.pk,
-            "type": Transaction.Type.EXPENSE,
-            "date": "2023-03-01",
-            "reference_date": "2023-03",  # Test custom format
-            "amount": "25.50",
-            "description": "New API Expense",
-            "category": self.category_api.name,  # Assuming TransactionCategoryField handles name to instance
-            "tags": [
-                self.tag_api.name
-            ],  # Assuming TransactionTagField handles list of names
-            "entities": [
-                self.entity_api.name
-            ],  # Assuming TransactionEntityField handles list of names
-        }
-        response = self.client.post(url, data, format="json")
-        self.assertEqual(response.status_code, status.HTTP_201_CREATED, response.data)
-        self.assertTrue(
-            Transaction.objects.filter(description="New API Expense").exists()
-        )
-
-        created_transaction = Transaction.objects.get(description="New API Expense")
-        self.assertEqual(created_transaction.owner, self.user)  # Check if owner is set
-        self.assertEqual(created_transaction.category.name, self.category_api.name)
-        self.assertIn(self.tag_api, created_transaction.tags.all())
-        mock_signal_send.assert_called_once()
-
-    def test_create_transaction_missing_fields(self):
-        url = reverse("transaction-list")
-        data = {
-            "account_id": self.account_usd_api.pk,
-            "type": Transaction.Type.EXPENSE,
-        }  # Missing date, amount, desc
-        response = self.client.post(url, data, format="json")
-        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
-        self.assertIn("date", response.data)  # Or reference_date due to custom validate
-        self.assertIn("amount", response.data)
-        self.assertIn("description", response.data)
-
-    @patch("apps.transactions.signals.transaction_updated.send")
-    def test_update_transaction_put(self, mock_signal_send):
-        t = Transaction.objects.create(
-            account=self.account_usd_api,
-            owner=self.user,
-            type=Transaction.Type.EXPENSE,
-            date=date(2023, 4, 1),
-            amount=Decimal("50.00"),
-            description="Initial PUT",
-        )
-        url = reverse("transaction-detail", kwargs={"pk": t.pk})
-        data = {
-            "account_id": self.account_usd_api.pk,
-            "type": Transaction.Type.INCOME,  # Changed type
-            "date": "2023-04-05",  # Changed date
-            "amount": "75.00",  # Changed amount
-            "description": "Updated PUT Transaction",
-            "category": self.category_api.name,
-        }
-        response = self.client.put(url, data, format="json")
-        self.assertEqual(response.status_code, status.HTTP_200_OK, response.data)
-        t.refresh_from_db()
-        self.assertEqual(t.description, "Updated PUT Transaction")
-        self.assertEqual(t.type, Transaction.Type.INCOME)
-        self.assertEqual(t.amount, Decimal("75.00"))
-        mock_signal_send.assert_called_once()
-
-    @patch("apps.transactions.signals.transaction_updated.send")
-    def test_update_transaction_patch(self, mock_signal_send):
-        t = Transaction.objects.create(
-            account=self.account_usd_api,
-            owner=self.user,
-            type=Transaction.Type.EXPENSE,
-            date=date(2023, 5, 1),
-            amount=Decimal("30.00"),
-            description="Initial PATCH",
-        )
-        url = reverse("transaction-detail", kwargs={"pk": t.pk})
-        data = {"description": "Patched Description"}
-        response = self.client.patch(url, data, format="json")
-        self.assertEqual(response.status_code, status.HTTP_200_OK, response.data)
-        t.refresh_from_db()
-        self.assertEqual(t.description, "Patched Description")
-        mock_signal_send.assert_called_once()
-
-    def test_delete_transaction(self):
-        t = Transaction.objects.create(
-            account=self.account_usd_api,
-            owner=self.user,
-            type=Transaction.Type.EXPENSE,
-            date=date(2023, 6, 1),
-            amount=Decimal("10.00"),
-            description="To Delete",
-        )
-        url = reverse("transaction-detail", kwargs={"pk": t.pk})
-        response = self.client.delete(url)
-        self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT)
-        # Default manager should not find it (soft delete)
-        self.assertFalse(Transaction.objects.filter(pk=t.pk).exists())
-        self.assertTrue(Transaction.all_objects.filter(pk=t.pk, deleted=True).exists())
-
-
-class AccountAPITests(BaseAPITestCase):
-    def test_list_accounts(self):
-        url = reverse("account-list")
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, status.HTTP_200_OK)
-        # setUp creates one account (self.account_usd_api) for self.user
-        self.assertEqual(response.data["pagination"]["count"], 1)
-        self.assertEqual(response.data["results"][0]["name"], self.account_usd_api.name)
-
-    def test_create_account(self):
-        url = reverse("account-list")
-        data = {
-            "name": "API Savings EUR",
-            "currency_id": self.currency_eur.pk,
-            "group_id": self.account_group_api.pk,
-            "is_asset": False,
-        }
-        response = self.client.post(url, data, format="json")
-        self.assertEqual(response.status_code, status.HTTP_201_CREATED, response.data)
-        self.assertTrue(
-            Account.objects.filter(name="API Savings EUR", owner=self.user).exists()
-        )
-
-
-# --- Permission Tests ---
-class APIPermissionTests(BaseAPITestCase):
-    def test_not_in_demo_mode_permission_regular_user(self):
-        # Temporarily activate demo mode
-        with self.settings(DEMO=True):
-            url = reverse("transaction-list")
-            # Attempt POST as regular user (self.user is not superuser)
-            response = self.client.post(url, {"description": "test"}, format="json")
-            # This depends on default permissions. If IsAuthenticated allows POST, NotInDemoMode should deny.
-            # If default is ReadOnly, then GET would be allowed, POST denied regardless of NotInDemoMode for non-admin.
-            # Assuming NotInDemoMode is a primary gate for write operations.
-            # The permission itself doesn't check request.method, just user status in demo.
-            # So, even GET might be denied if NotInDemoMode were the *only* permission.
-            # However, ViewSets usually have IsAuthenticated or similar allowing GET.
-            # Let's assume NotInDemoMode is added to default_permission_classes and tested on a write view.
-            # For a POST to transactions:
-            self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
-
-            # GET should still be allowed if default permissions allow it (e.g. IsAuthenticatedOrReadOnly)
-            # and NotInDemoMode only blocks mutating methods or specific views.
-            # The current NotInDemoMode blocks *all* access for non-superusers in demo.
-            get_response = self.client.get(url)
-            self.assertEqual(get_response.status_code, status.HTTP_403_FORBIDDEN)
-
-    def test_not_in_demo_mode_permission_superuser(self):
-        self.client.force_authenticate(user=self.superuser)
-        write_current_user(self.superuser)
-        with self.settings(DEMO=True):
-            url = reverse("transaction-list")
-            data = {  # Valid data for transaction creation
-                "account_id": self.account_usd_api.pk,
-                "type": Transaction.Type.EXPENSE,
-                "date": "2023-07-01",
-                "amount": "1.00",
-                "description": "Superuser Demo Post",
-            }
-            response = self.client.post(url, data, format="json")
-            self.assertEqual(
-                response.status_code, status.HTTP_201_CREATED, response.data
-            )
-
-            get_response = self.client.get(url)
-            self.assertEqual(get_response.status_code, status.HTTP_200_OK)
-
-    def test_access_in_non_demo_mode(self):
-        with self.settings(DEMO=False):  # Explicitly ensure demo mode is off
-            url = reverse("transaction-list")
-            data = {
-                "account_id": self.account_usd_api.pk,
-                "type": Transaction.Type.EXPENSE,
-                "date": "2023-08-01",
-                "amount": "2.00",
-                "description": "Non-Demo Post",
-            }
-            response = self.client.post(url, data, format="json")
-            self.assertEqual(
-                response.status_code, status.HTTP_201_CREATED, response.data
-            )
-
-            get_response = self.client.get(url)
-            self.assertEqual(get_response.status_code, status.HTTP_200_OK)
-
-    def test_unauthenticated_access(self):
-        self.client.logout()  # Or self.client.force_authenticate(user=None)
-        write_current_user(None)
-        url = reverse("transaction-list")
-        response = self.client.get(url)
-        # Default behavior for DRF is IsAuthenticated, so should be 401 or 403
-        # If IsAuthenticatedOrReadOnly, GET would be 200.
-        # Given serializers specify IsAuthenticated, likely 401/403.
-        self.assertTrue(
-            response.status_code
-            in [status.HTTP_401_UNAUTHORIZED, status.HTTP_403_FORBIDDEN]
-        )

app/apps/common/apps.py

@@ -4,3 +4,17 @@ from django.apps import AppConfig
 class CommonConfig(AppConfig):
     default_auto_field = "django.db.models.BigAutoField"
     name = "apps.common"
+
+    def ready(self):
+        from django.contrib import admin
+        from django.contrib.sites.models import Site
+        from allauth.socialaccount.models import (
+            SocialAccount,
+            SocialApp,
+            SocialToken,
+        )
+
+        admin.site.unregister(Site)
+        admin.site.unregister(SocialAccount)
+        admin.site.unregister(SocialApp)
+        admin.site.unregister(SocialToken)

app/apps/common/functions/format.py

@@ -5,7 +5,7 @@ from django.utils.formats import get_format as original_get_format
 def get_format(format_type=None, lang=None, use_l10n=None):
     user = get_current_user()
 
-    if user and user.is_authenticated and hasattr(user, "settings"):
+    if user and user.is_authenticated and hasattr(user, "settings") and use_l10n:
         user_settings = user.settings
         if format_type == "THOUSAND_SEPARATOR":
             number_format = getattr(user_settings, "number_format", None)

app/apps/common/models.py

@@ -27,7 +27,7 @@ class SharedObject(models.Model):
     # Access control enum
     class Visibility(models.TextChoices):
         private = "private", _("Private")
-        public = "public", _("Public")
+        is_paid = "public", _("Public")
 
     # Core sharing fields
     owner = models.ForeignKey(
@@ -65,6 +65,18 @@ class SharedObject(models.Model):
         super().save(*args, **kwargs)
 
 
+class OwnedObjectManager(models.Manager):
+    def get_queryset(self):
+        """Return only objects the user can access"""
+        user = get_current_user()
+        base_qs = super().get_queryset()
+
+        if user and user.is_authenticated:
+            return base_qs.filter(Q(owner=user) | Q(owner=None)).distinct()
+
+        return base_qs
+
+
 class OwnedObject(models.Model):
     owner = models.ForeignKey(
         settings.AUTH_USER_MODEL,

app/apps/common/tests.py

@@ -1,327 +0,0 @@
-import datetime
-from decimal import Decimal
-
-from django.core.exceptions import ValidationError
-from django.db import models
-from django.test import TestCase
-from django.utils import translation
-
-from apps.common.fields.month_year import MonthYearModelField
-from apps.common.functions.dates import remaining_days_in_month
-from apps.common.functions.decimals import truncate_decimal
-from apps.common.templatetags.decimal import drop_trailing_zeros, localize_number
-from apps.common.templatetags.month_name import month_name
-
-
-class DateFunctionsTests(TestCase):
-    def test_remaining_days_in_month(self):
-        # Test with a date in the middle of the month
-        current_date_mid = datetime.date(2023, 10, 15)
-        self.assertEqual(
-            remaining_days_in_month(2023, 10, current_date_mid), 17
-        )  # 31 - 15 + 1
-
-        # Test with the first day of the month
-        current_date_first = datetime.date(2023, 10, 1)
-        self.assertEqual(remaining_days_in_month(2023, 10, current_date_first), 31)
-
-        # Test with the last day of the month
-        current_date_last = datetime.date(2023, 10, 31)
-        self.assertEqual(remaining_days_in_month(2023, 10, current_date_last), 1)
-
-        # Test with a different month (should return total days in that month)
-        self.assertEqual(remaining_days_in_month(2023, 11, current_date_mid), 30)
-
-        # Test leap year (February 2024)
-        current_date_feb_leap = datetime.date(2024, 2, 10)
-        self.assertEqual(
-            remaining_days_in_month(2024, 2, current_date_feb_leap), 20
-        )  # 29 - 10 + 1
-        current_date_feb_leap_other = datetime.date(2023, 1, 1)
-        self.assertEqual(
-            remaining_days_in_month(2024, 2, current_date_feb_leap_other), 29
-        )
-
-        # Test non-leap year (February 2023)
-        current_date_feb_non_leap = datetime.date(2023, 2, 10)
-        self.assertEqual(
-            remaining_days_in_month(2023, 2, current_date_feb_non_leap), 19
-        )  # 28 - 10 + 1
-
-
-class DecimalFunctionsTests(TestCase):
-    def test_truncate_decimal(self):
-        self.assertEqual(truncate_decimal(Decimal("123.456789"), 0), Decimal("123"))
-        self.assertEqual(truncate_decimal(Decimal("123.456789"), 2), Decimal("123.45"))
-        self.assertEqual(
-            truncate_decimal(Decimal("123.45"), 4), Decimal("123.45")
-        )  # No change if fewer places
-        self.assertEqual(truncate_decimal(Decimal("123"), 2), Decimal("123"))
-        self.assertEqual(truncate_decimal(Decimal("0.12345"), 3), Decimal("0.123"))
-        self.assertEqual(truncate_decimal(Decimal("-123.456"), 2), Decimal("-123.45"))
-
-
-# Dummy model for testing MonthYearModelField
-class Event(models.Model):
-    name = models.CharField(max_length=100)
-    event_month = MonthYearModelField()
-
-    class Meta:
-        app_label = "common"  # Required for temporary models in tests
-
-
-class MonthYearModelFieldTests(TestCase):
-    def test_to_python_valid_formats(self):
-        field = MonthYearModelField()
-        # YYYY-MM format
-        self.assertEqual(field.to_python("2023-10"), datetime.date(2023, 10, 1))
-        # YYYY-MM-DD format (should still set day to 1)
-        self.assertEqual(field.to_python("2023-10-15"), datetime.date(2023, 10, 1))
-        # Already a date object
-        date_obj = datetime.date(2023, 11, 1)
-        self.assertEqual(field.to_python(date_obj), date_obj)
-        # None value
-        self.assertIsNone(field.to_python(None))
-
-    def test_to_python_invalid_formats(self):
-        field = MonthYearModelField()
-        with self.assertRaises(ValidationError):
-            field.to_python("2023/10")
-        with self.assertRaises(ValidationError):
-            field.to_python("10-2023")
-        with self.assertRaises(ValidationError):
-            field.to_python("invalid-date")
-        with self.assertRaises(ValidationError):  # Invalid month
-            field.to_python("2023-13")
-
-    # More involved test requiring database interaction (migrations for dummy model)
-    # This part might fail in the current sandbox if migrations can't be run for 'common.Event'
-    # For now, focusing on to_python. A full test would involve creating an Event instance.
-    # def test_db_storage_and_retrieval(self):
-    #     Event.objects.create(name="Test Event", event_month=datetime.date(2023, 9, 15))
-    #     event = Event.objects.get(name="Test Event")
-    #     self.assertEqual(event.event_month, datetime.date(2023, 9, 1))
-
-    #     # Test with string input that to_python handles
-    #     event_str_input = Event.objects.create(name="Event String", event_month="2024-07")
-    #     retrieved_event_str = Event.objects.get(name="Event String")
-    #     self.assertEqual(retrieved_event_str.event_month, datetime.date(2024, 7, 1))
-
-
-class CommonTemplateTagTests(TestCase):
-    def test_drop_trailing_zeros(self):
-        self.assertEqual(drop_trailing_zeros(Decimal("10.500")), Decimal("10.5"))
-        self.assertEqual(drop_trailing_zeros(Decimal("10.00")), Decimal("10"))
-        self.assertEqual(drop_trailing_zeros(Decimal("10")), Decimal("10"))
-        self.assertEqual(drop_trailing_zeros("12.340"), Decimal("12.34"))
-        self.assertEqual(drop_trailing_zeros(12.0), Decimal("12"))  # float input
-        self.assertEqual(drop_trailing_zeros("not_a_decimal"), "not_a_decimal")
-        self.assertIsNone(drop_trailing_zeros(None))
-
-    def test_localize_number(self):
-        # Basic test, full localization testing is complex
-        self.assertEqual(
-            localize_number(Decimal("12345.678"), decimal_places=2), "12,345.67"
-        )  # Assuming EN locale default
-        self.assertEqual(localize_number(Decimal("12345"), decimal_places=0), "12,345")
-        self.assertEqual(localize_number(12345.67, decimal_places=1), "12,345.6")
-        self.assertEqual(localize_number("not_a_number"), "not_a_number")
-
-        # Test with a different language if possible, though environment might be fixed
-        # with translation.override('fr'):
-        #     self.assertEqual(localize_number(Decimal("12345.67"), decimal_places=2), "12 345,67") # Non-breaking space for FR
-
-    def test_month_name_tag(self):
-        self.assertEqual(month_name(1), "January")
-        self.assertEqual(month_name(12), "December")
-        # Assuming English as default, Django's translation might affect this
-        # For more robust test, you might need to activate a specific language
-        with translation.override("es"):
-            self.assertEqual(month_name(1), "enero")
-        with translation.override("en"):  # Switch back
-            self.assertEqual(month_name(1), "January")
-
-    def test_month_name_invalid_input(self):
-        # Test behavior for invalid month numbers, though calendar.month_name would raise IndexError
-        # The filter should ideally handle this gracefully or be documented
-        with self.assertRaises(
-            IndexError
-        ):  # calendar.month_name[0] is empty string, 13 is out of bounds
-            month_name(0)
-        with self.assertRaises(IndexError):
-            month_name(13)
-        # Depending on desired behavior, might expect empty string or specific error
-        # For now, expecting it to follow calendar.month_name behavior
-
-
-from django.contrib.auth.models import (
-    AnonymousUser,
-    User,
-)  # Using Django's User for tests
-from django.http import HttpResponse, HttpResponseForbidden, HttpResponseRedirect
-from django.urls import reverse
-from django.test import RequestFactory
-
-from apps.common.decorators.htmx import only_htmx
-from apps.common.decorators.user import htmx_login_required, is_superuser
-
-# Assuming login_url can be resolved, e.g., from settings.LOGIN_URL or a known named URL
-# For testing, we might need to ensure LOGIN_URL is set or mock it.
-# Let's assume 'login' is a valid URL name for redirection.
-
-
-# Dummy views for testing decorators
-@only_htmx
-def dummy_view_only_htmx(request):
-    return HttpResponse("HTMX Success")
-
-
-@htmx_login_required
-def dummy_view_htmx_login_required(request):
-    return HttpResponse("User Authenticated HTMX")
-
-
-@is_superuser
-def dummy_view_is_superuser(request):
-    return HttpResponse("Superuser Access Granted")
-
-
-class DecoratorTests(TestCase):
-    def setUp(self):
-        self.factory = RequestFactory()
-        self.user = User.objects.create_user(
-            email="test@example.com", password="password"
-        )
-        self.superuser = User.objects.create_superuser(
-            email="super@example.com", password="password"
-        )
-        # Ensure LOGIN_URL is set for tests that redirect to login
-        # This can be done via settings override if not already set globally
-        self.settings_override = self.settings(
-            LOGIN_URL="/fake-login/"
-        )  # Use a dummy login URL
-        self.settings_override.enable()
-
-    def tearDown(self):
-        self.settings_override.disable()
-
-    # @only_htmx tests
-    def test_only_htmx_allows_htmx_request(self):
-        request = self.factory.get("/dummy-path", HTTP_HX_REQUEST="true")
-        response = dummy_view_only_htmx(request)
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.content, b"HTMX Success")
-
-    def test_only_htmx_forbids_non_htmx_request(self):
-        request = self.factory.get("/dummy-path")
-        response = dummy_view_only_htmx(request)
-        self.assertEqual(
-            response.status_code, 403
-        )  # Or whatever HttpResponseForbidden returns by default
-
-    # @htmx_login_required tests
-    def test_htmx_login_required_allows_authenticated_user(self):
-        request = self.factory.get("/dummy-path", HTTP_HX_REQUEST="true")
-        request.user = self.user
-        response = dummy_view_htmx_login_required(request)
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.content, b"User Authenticated HTMX")
-
-    def test_htmx_login_required_redirects_anonymous_user_for_htmx(self):
-        request = self.factory.get("/dummy-path", HTTP_HX_REQUEST="true")
-        request.user = AnonymousUser()
-        response = dummy_view_htmx_login_required(request)
-        self.assertEqual(response.status_code, 302)  # Redirect
-        # Check for HX-Redirect header for HTMX redirects to login
-        self.assertIn("HX-Redirect", response.headers)
-        self.assertEqual(
-            response.headers["HX-Redirect"], "/fake-login/?next=/dummy-path"
-        )
-
-    def test_htmx_login_required_redirects_anonymous_user_for_non_htmx(self):
-        # This decorator specifically checks for HX-Request and returns 403 if not present *before* auth check.
-        # However, if it were a general login_required for htmx, it might redirect non-htmx too.
-        # The current name `htmx_login_required` implies it's for HTMX, let's test its behavior for non-HTMX.
-        # Based on its typical implementation (like in `apps.users.views.UserLoginView` which is `only_htmx`),
-        # it might return 403 if not an HTMX request, or redirect if it's a general login_required adapted for htmx.
-        # Let's assume it's strictly for HTMX and would deny non-HTMX, or that the login_required part
-        # would kick in.
-        # Given the decorator might be composed or simple, let's test the redirect path.
-        request = self.factory.get("/dummy-path")  # Non-HTMX
-        request.user = AnonymousUser()
-        response = dummy_view_htmx_login_required(request)
-        # If it's a standard @login_required behavior for non-HTMX part:
-        self.assertTrue(response.status_code == 302 or response.status_code == 403)
-        if response.status_code == 302:
-            self.assertTrue(response.url.startswith("/fake-login/"))
-
-    # @is_superuser tests
-    def test_is_superuser_allows_superuser(self):
-        request = self.factory.get("/dummy-path")
-        request.user = self.superuser
-        response = dummy_view_is_superuser(request)
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.content, b"Superuser Access Granted")
-
-    def test_is_superuser_forbids_regular_user(self):
-        request = self.factory.get("/dummy-path")
-        request.user = self.user
-        response = dummy_view_is_superuser(request)
-        self.assertEqual(
-            response.status_code, 403
-        )  # Or redirects to login if @login_required is also part of it
-
-    def test_is_superuser_forbids_anonymous_user(self):
-        request = self.factory.get("/dummy-path")
-        request.user = AnonymousUser()
-        response = dummy_view_is_superuser(request)
-        # This typically redirects to login if @login_required is implicitly part of such checks,
-        # or returns 403 if it's purely a superuser check after authentication.
-        self.assertTrue(response.status_code == 302 or response.status_code == 403)
-        if response.status_code == 302:  # Standard redirect to login
-            self.assertTrue(response.url.startswith("/fake-login/"))
-
-
-from io import StringIO
-from django.core.management import call_command
-from django.contrib.auth import get_user_model
-
-# Ensure User is available for management command test
-User = get_user_model()
-
-
-class ManagementCommandTests(TestCase):
-    def test_setup_users_command(self):
-        # Capture output
-        out = StringIO()
-        # Call the command. Provide dummy passwords or expect prompts to be handled if interactive.
-        # For non-interactive, environment variables or default passwords in command might be used.
-        # Let's assume it creates users with default/predictable passwords if run non-interactively
-        # or we can mock input if needed.
-        # For this test, we'll just check if it runs without error and creates some expected users.
-        # This command might need specific environment variables like ADMIN_EMAIL, ADMIN_PASSWORD.
-        # We'll set them for the test.
-
-        test_admin_email = "admin@command.com"
-        test_admin_pass = "CommandPass123"
-
-        with self.settings(
-            ADMIN_EMAIL=test_admin_email, ADMIN_PASSWORD=test_admin_pass
-        ):
-            call_command("setup_users", stdout=out)
-
-        # Check if the admin user was created (if the command is supposed to create one)
-        self.assertTrue(User.objects.filter(email=test_admin_email).exists())
-        admin_user = User.objects.get(email=test_admin_email)
-        self.assertTrue(admin_user.is_superuser)
-        self.assertTrue(admin_user.check_password(test_admin_pass))
-
-        # The command also creates a 'user@example.com'
-        self.assertTrue(User.objects.filter(email="user@example.com").exists())
-
-        # Check output for success messages (optional, depends on command's verbosity)
-        # self.assertIn("Superuser admin@command.com created.", out.getvalue())
-        # self.assertIn("User user@example.com created.", out.getvalue())
-        # Note: The actual success messages might differ. This is a basic check.
-        # The command might also try to create groups, assign permissions etc.
-        # A more thorough test would check all side effects of the command.

app/apps/common/widgets/datepicker.py

@@ -37,7 +37,9 @@ class AirDatePickerInput(widgets.DateInput):
     def _get_current_language():
         """Get current language code in format compatible with AirDatepicker"""
         lang_code = translation.get_language()
-        # AirDatepicker uses simple language codes
+        # AirDatepicker uses simple language codes, except for pt-br
+        if lang_code.lower() == "pt-br":
+            return "pt-BR"
         return lang_code.split("-")[0]
 
     def _get_format(self):

app/apps/common/widgets/decimal.py

@@ -37,6 +37,7 @@ class ArbitraryDecimalDisplayNumberInput(forms.TextInput):
                 "x-data": "",
                 "x-mask:dynamic": f"$money($input, '{get_format('DECIMAL_SEPARATOR')}', "
                 f"'{get_format('THOUSAND_SEPARATOR')}', '30')",
+                "x-on:keyup": "$el.dispatchEvent(new Event('input'))",
             }
         )
 

app/apps/currencies/tests.py

@@ -1,78 +1,68 @@
 from decimal import Decimal
-from unittest.mock import patch
 
-from django.contrib.auth import get_user_model
 from django.core.exceptions import ValidationError
 from django.db import IntegrityError
-from django.test import TestCase, Client
-from django.urls import reverse
+from django.test import TestCase
 from django.utils import timezone
 
-from apps.currencies.models import Currency, ExchangeRate, ExchangeRateService
-from apps.accounts.models import Account  # For ExchangeRateService target_accounts
-
-User = get_user_model()
+from apps.currencies.models import Currency, ExchangeRate
 
 
-class BaseCurrencyAppTest(TestCase):
-    def setUp(self):
-        self.user = User.objects.create_user(
-            email="curtestuser@example.com", password="password"
-        )
-        self.client = Client()
-        self.client.login(email="curtestuser@example.com", password="password")
-
-        self.usd = Currency.objects.create(
-            code="USD", name="US Dollar", decimal_places=2, prefix="$"
-        )
-        self.eur = Currency.objects.create(
-            code="EUR", name="Euro", decimal_places=2, prefix="€"
-        )
-
-
-class CurrencyModelTests(BaseCurrencyAppTest):  # Changed from CurrencyTests
+class CurrencyTests(TestCase):
     def test_currency_creation(self):
         """Test basic currency creation"""
-        # self.usd is already created in BaseCurrencyAppTest
-        self.assertEqual(str(self.usd), "US Dollar")
-        self.assertEqual(self.usd.code, "USD")
-        self.assertEqual(self.usd.decimal_places, 2)
-        self.assertEqual(self.usd.prefix, "$")
-        # Test creation with suffix
-        jpy = Currency.objects.create(
-            code="JPY", name="Japanese Yen", decimal_places=0, suffix="円"
+        currency = Currency.objects.create(
+            code="USD", name="US Dollar", decimal_places=2, prefix="$ ", suffix=" END "
         )
-        self.assertEqual(jpy.suffix, "円")
+        self.assertEqual(str(currency), "US Dollar")
+        self.assertEqual(currency.code, "USD")
+        self.assertEqual(currency.decimal_places, 2)
+        self.assertEqual(currency.prefix, "$ ")
+        self.assertEqual(currency.suffix, " END ")
 
     def test_currency_decimal_places_validation(self):
         """Test decimal places validation for maximum value"""
-        currency = Currency(code="TESTMAX", name="Test Currency Max", decimal_places=31)
+        currency = Currency(
+            code="TEST",
+            name="Test Currency",
+            decimal_places=31,  # Should fail as max is 30
+        )
         with self.assertRaises(ValidationError):
             currency.full_clean()
 
     def test_currency_decimal_places_negative(self):
         """Test decimal places validation for negative value"""
-        currency = Currency(code="TESTNEG", name="Test Currency Neg", decimal_places=-1)
+        currency = Currency(
+            code="TEST",
+            name="Test Currency",
+            decimal_places=-1,  # Should fail as min is 0
+        )
         with self.assertRaises(ValidationError):
             currency.full_clean()
 
-    # Note: unique_code and unique_name tests might behave differently with how Django handles
-    # model creation vs full_clean. IntegrityError is caught at DB level.
-    # These tests are fine as they are for DB level.
+    def test_currency_unique_code(self):
+        """Test that currency codes must be unique"""
+        Currency.objects.create(code="USD", name="US Dollar", decimal_places=2)
+        with self.assertRaises(IntegrityError):
+            Currency.objects.create(code="USD", name="Another Dollar", decimal_places=2)
 
-    def test_currency_clean_self_exchange_currency(self):
-        """Test that a currency cannot be its own exchange_currency."""
-        self.usd.exchange_currency = self.usd
-        with self.assertRaises(ValidationError) as context:
-            self.usd.full_clean()
-        self.assertIn("exchange_currency", context.exception.message_dict)
-        self.assertIn(
-            "Currency cannot have itself as exchange currency.",
-            context.exception.message_dict["exchange_currency"],
+    def test_currency_unique_name(self):
+        """Test that currency names must be unique"""
+        Currency.objects.create(code="USD", name="US Dollar", decimal_places=2)
+        with self.assertRaises(IntegrityError):
+            Currency.objects.create(code="USD2", name="US Dollar", decimal_places=2)
+
+
+class ExchangeRateTests(TestCase):
+    def setUp(self):
+        """Set up test data"""
+        self.usd = Currency.objects.create(
+            code="USD", name="US Dollar", decimal_places=2, prefix="$ "
+        )
+        self.eur = Currency.objects.create(
+            code="EUR", name="Euro", decimal_places=2, prefix="€ "
         )
 
-
-class ExchangeRateModelTests(BaseCurrencyAppTest):  # Changed from ExchangeRateTests
     def test_exchange_rate_creation(self):
         """Test basic exchange rate creation"""
         rate = ExchangeRate.objects.create(
@@ -93,327 +83,10 @@ class ExchangeRateModelTests(BaseCurrencyAppTest):  # Changed from ExchangeRateT
             rate=Decimal("0.85"),
             date=date,
         )
-        with self.assertRaises(IntegrityError):  # Specifically expect IntegrityError
+        with self.assertRaises(Exception):  # Could be IntegrityError
             ExchangeRate.objects.create(
                 from_currency=self.usd,
                 to_currency=self.eur,
-                rate=Decimal("0.86"),  # Different rate, same pair and date
+                rate=Decimal("0.86"),
                 date=date,
             )
-
-    def test_exchange_rate_clean_same_currency(self):
-        """Test that from_currency and to_currency cannot be the same."""
-        rate = ExchangeRate(
-            from_currency=self.usd,
-            to_currency=self.usd,  # Same currency
-            rate=Decimal("1.00"),
-            date=timezone.now(),
-        )
-        with self.assertRaises(ValidationError) as context:
-            rate.full_clean()
-        self.assertIn("to_currency", context.exception.message_dict)
-        self.assertIn(
-            "From and To currencies cannot be the same.",
-            context.exception.message_dict["to_currency"],
-        )
-
-
-class ExchangeRateServiceModelTests(BaseCurrencyAppTest):
-    def test_service_creation(self):
-        service = ExchangeRateService.objects.create(
-            name="Test Coingecko Free",
-            service_type=ExchangeRateService.ServiceType.COINGECKO_FREE,
-            interval_type=ExchangeRateService.IntervalType.EVERY,
-            fetch_interval="12",  # Every 12 hours
-        )
-        self.assertEqual(str(service), "Test Coingecko Free")
-        self.assertTrue(service.is_active)
-
-    def test_fetch_interval_validation_every_x_hours(self):
-        # Valid
-        service = ExchangeRateService(
-            name="Valid Every",
-            service_type=ExchangeRateService.ServiceType.SYNTH_FINANCE,
-            interval_type=ExchangeRateService.IntervalType.EVERY,
-            fetch_interval="6",
-        )
-        service.full_clean()  # Should not raise
-
-        # Invalid - not a digit
-        service.fetch_interval = "abc"
-        with self.assertRaises(ValidationError) as context:
-            service.full_clean()
-        self.assertIn("fetch_interval", context.exception.message_dict)
-        self.assertIn(
-            "'Every X hours' interval type requires a positive integer.",
-            context.exception.message_dict["fetch_interval"][0],
-        )
-
-        # Invalid - out of range
-        service.fetch_interval = "0"
-        with self.assertRaises(ValidationError):
-            service.full_clean()
-        service.fetch_interval = "25"
-        with self.assertRaises(ValidationError):
-            service.full_clean()
-
-    def test_fetch_interval_validation_on_not_on(self):
-        # Valid examples for 'on' or 'not_on'
-        valid_intervals = ["1", "0,12", "1-5", "1-5,8,10-12", "0,1,2,3,22,23"]
-        for interval in valid_intervals:
-            service = ExchangeRateService(
-                name=f"Test On {interval}",
-                service_type=ExchangeRateService.ServiceType.SYNTH_FINANCE,
-                interval_type=ExchangeRateService.IntervalType.ON,
-                fetch_interval=interval,
-            )
-            service.full_clean()  # Should not raise
-            # Check normalized form (optional, but good if model does it)
-            # self.assertEqual(service.fetch_interval, ",".join(str(h) for h in sorted(service._parse_hour_ranges(interval))))
-
-        invalid_intervals = [
-            "abc",
-            "1-",
-            "-5",
-            "24",
-            "-1",
-            "1-24",
-            "1,2,25",
-            "5-1",  # Invalid hour, range, or format
-            "1.5",
-            "1, 2, 3,",  # decimal, trailing comma
-        ]
-        for interval in invalid_intervals:
-            service = ExchangeRateService(
-                name=f"Test On Invalid {interval}",
-                service_type=ExchangeRateService.ServiceType.SYNTH_FINANCE,
-                interval_type=ExchangeRateService.IntervalType.NOT_ON,
-                fetch_interval=interval,
-            )
-            with self.assertRaises(ValidationError) as context:
-                service.full_clean()
-            self.assertIn("fetch_interval", context.exception.message_dict)
-            self.assertTrue(
-                "Invalid hour format"
-                in context.exception.message_dict["fetch_interval"][0]
-                or "Hours must be between 0 and 23"
-                in context.exception.message_dict["fetch_interval"][0]
-                or "Invalid range"
-                in context.exception.message_dict["fetch_interval"][0]
-            )
-
-    @patch("apps.currencies.exchange_rates.fetcher.PROVIDER_MAPPING")
-    def test_get_provider(self, mock_provider_mapping):
-        # Mock a provider class
-        class MockProvider:
-            def __init__(self, api_key=None):
-                self.api_key = api_key
-
-        mock_provider_mapping.__getitem__.return_value = MockProvider
-
-        service = ExchangeRateService(
-            name="Test Get Provider",
-            service_type=ExchangeRateService.ServiceType.COINGECKO_FREE,  # Any valid choice
-            api_key="testkey",
-        )
-        provider_instance = service.get_provider()
-        self.assertIsInstance(provider_instance, MockProvider)
-        self.assertEqual(provider_instance.api_key, "testkey")
-        mock_provider_mapping.__getitem__.assert_called_with(
-            ExchangeRateService.ServiceType.COINGECKO_FREE
-        )
-
-
-class CurrencyViewTests(BaseCurrencyAppTest):
-    def test_currency_list_view(self):
-        response = self.client.get(reverse("currencies_list"))
-        self.assertEqual(response.status_code, 200)
-        self.assertContains(response, self.usd.name)
-        self.assertContains(response, self.eur.name)
-
-    def test_currency_add_view(self):
-        data = {
-            "code": "GBP",
-            "name": "British Pound",
-            "decimal_places": 2,
-            "prefix": "£",
-        }
-        response = self.client.post(reverse("currency_add"), data)
-        self.assertEqual(response.status_code, 204)  # HTMX success
-        self.assertTrue(Currency.objects.filter(code="GBP").exists())
-
-    def test_currency_edit_view(self):
-        gbp = Currency.objects.create(
-            code="GBP", name="Pound Sterling", decimal_places=2
-        )
-        data = {
-            "code": "GBP",
-            "name": "British Pound Sterling",
-            "decimal_places": 2,
-            "prefix": "£",
-        }
-        response = self.client.post(reverse("currency_edit", args=[gbp.id]), data)
-        self.assertEqual(response.status_code, 204)
-        gbp.refresh_from_db()
-        self.assertEqual(gbp.name, "British Pound Sterling")
-
-    def test_currency_delete_view(self):
-        cad = Currency.objects.create(
-            code="CAD", name="Canadian Dollar", decimal_places=2
-        )
-        response = self.client.delete(reverse("currency_delete", args=[cad.id]))
-        self.assertEqual(response.status_code, 204)
-        self.assertFalse(Currency.objects.filter(code="CAD").exists())
-
-
-class ExchangeRateViewTests(BaseCurrencyAppTest):
-    def test_exchange_rate_list_view_main(self):
-        # This view lists pairs, not individual rates directly in the main list
-        ExchangeRate.objects.create(
-            from_currency=self.usd,
-            to_currency=self.eur,
-            rate=Decimal("0.9"),
-            date=timezone.now(),
-        )
-        response = self.client.get(reverse("exchange_rates_list"))
-        self.assertEqual(response.status_code, 200)
-        self.assertContains(
-            response, self.usd.name
-        )  # Check if pair components are mentioned
-        self.assertContains(response, self.eur.name)
-
-    def test_exchange_rate_list_pair_view(self):
-        rate_date = timezone.now()
-        ExchangeRate.objects.create(
-            from_currency=self.usd,
-            to_currency=self.eur,
-            rate=Decimal("0.9"),
-            date=rate_date,
-        )
-        url = (
-            reverse("exchange_rates_list_pair")
-            + f"?from={self.usd.name}&to={self.eur.name}"
-        )
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-        self.assertContains(response, "0.9")  # Check if the rate is displayed
-
-    def test_exchange_rate_add_view(self):
-        data = {
-            "from_currency": self.usd.id,
-            "to_currency": self.eur.id,
-            "rate": "0.88",
-            "date": timezone.now().strftime(
-                "%Y-%m-%d %H:%M:%S"
-            ),  # Match form field format
-        }
-        response = self.client.post(reverse("exchange_rate_add"), data)
-        self.assertEqual(
-            response.status_code,
-            204,
-            (
-                response.content.decode()
-                if response.content and response.status_code != 204
-                else "No content on 204"
-            ),
-        )
-        self.assertTrue(
-            ExchangeRate.objects.filter(
-                from_currency=self.usd, to_currency=self.eur, rate=Decimal("0.88")
-            ).exists()
-        )
-
-    def test_exchange_rate_edit_view(self):
-        rate = ExchangeRate.objects.create(
-            from_currency=self.usd,
-            to_currency=self.eur,
-            rate=Decimal("0.91"),
-            date=timezone.now(),
-        )
-        data = {
-            "from_currency": self.usd.id,
-            "to_currency": self.eur.id,
-            "rate": "0.92",
-            "date": rate.date.strftime("%Y-%m-%d %H:%M:%S"),
-        }
-        response = self.client.post(reverse("exchange_rate_edit", args=[rate.id]), data)
-        self.assertEqual(response.status_code, 204)
-        rate.refresh_from_db()
-        self.assertEqual(rate.rate, Decimal("0.92"))
-
-    def test_exchange_rate_delete_view(self):
-        rate = ExchangeRate.objects.create(
-            from_currency=self.usd,
-            to_currency=self.eur,
-            rate=Decimal("0.93"),
-            date=timezone.now(),
-        )
-        response = self.client.delete(reverse("exchange_rate_delete", args=[rate.id]))
-        self.assertEqual(response.status_code, 204)
-        self.assertFalse(ExchangeRate.objects.filter(id=rate.id).exists())
-
-
-class ExchangeRateServiceViewTests(BaseCurrencyAppTest):
-    def test_exchange_rate_service_list_view(self):
-        service = ExchangeRateService.objects.create(
-            name="My Test Service",
-            service_type=ExchangeRateService.ServiceType.SYNTH_FINANCE,
-            fetch_interval="1",
-        )
-        response = self.client.get(reverse("automatic_exchange_rates_list"))
-        self.assertEqual(response.status_code, 200)
-        self.assertContains(response, service.name)
-
-    def test_exchange_rate_service_add_view(self):
-        data = {
-            "name": "New Fetcher Service",
-            "service_type": ExchangeRateService.ServiceType.COINGECKO_FREE,
-            "is_active": "on",
-            "interval_type": ExchangeRateService.IntervalType.EVERY,
-            "fetch_interval": "24",
-            # target_currencies and target_accounts are M2M, handled differently or optional
-        }
-        response = self.client.post(reverse("automatic_exchange_rate_add"), data)
-        self.assertEqual(response.status_code, 204)
-        self.assertTrue(
-            ExchangeRateService.objects.filter(name="New Fetcher Service").exists()
-        )
-
-    def test_exchange_rate_service_edit_view(self):
-        service = ExchangeRateService.objects.create(
-            name="Editable Service",
-            service_type=ExchangeRateService.ServiceType.SYNTH_FINANCE,
-            fetch_interval="1",
-        )
-        data = {
-            "name": "Edited Fetcher Service",
-            "service_type": service.service_type,
-            "is_active": "on",
-            "interval_type": service.interval_type,
-            "fetch_interval": "6",  # Changed interval
-        }
-        response = self.client.post(
-            reverse("automatic_exchange_rate_edit", args=[service.id]), data
-        )
-        self.assertEqual(response.status_code, 204)
-        service.refresh_from_db()
-        self.assertEqual(service.name, "Edited Fetcher Service")
-        self.assertEqual(service.fetch_interval, "6")
-
-    def test_exchange_rate_service_delete_view(self):
-        service = ExchangeRateService.objects.create(
-            name="Deletable Service",
-            service_type=ExchangeRateService.ServiceType.SYNTH_FINANCE,
-            fetch_interval="1",
-        )
-        response = self.client.delete(
-            reverse("automatic_exchange_rate_delete", args=[service.id])
-        )
-        self.assertEqual(response.status_code, 204)
-        self.assertFalse(ExchangeRateService.objects.filter(id=service.id).exists())
-
-    @patch("apps.currencies.tasks.manual_fetch_exchange_rates.defer")
-    def test_exchange_rate_service_force_fetch_view(self, mock_defer):
-        response = self.client.get(reverse("automatic_exchange_rate_force_fetch"))
-        self.assertEqual(response.status_code, 204)  # Triggers toast
-        mock_defer.assert_called_once()

app/apps/export_app/tests.py

@@ -1,243 +1,3 @@
-import csv
-import io
-import zipfile
-from decimal import Decimal
-from datetime import date, datetime
+from django.test import TestCase
 
-from django.test import TestCase, Client
-from django.contrib.auth import get_user_model
-from django.urls import reverse
-from django.utils import timezone
-
-from apps.accounts.models import Account, AccountGroup
-from apps.currencies.models import Currency
-from apps.transactions.models import (
-    Transaction,
-    TransactionCategory,
-    TransactionTag,
-    TransactionEntity,
-)
-from apps.export_app.resources.transactions import (
-    TransactionResource,
-    TransactionTagResource,
-)
-from apps.export_app.resources.accounts import AccountResource
-from apps.export_app.forms import ExportForm, RestoreForm  # Added RestoreForm
-
-User = get_user_model()
-
-
-class BaseExportAppTest(TestCase):
-    @classmethod
-    def setUpTestData(cls):
-        cls.superuser = User.objects.create_superuser(
-            email="exportadmin@example.com", password="password"
-        )
-        cls.currency_usd = Currency.objects.create(
-            code="USD", name="US Dollar", decimal_places=2
-        )
-        cls.currency_eur = Currency.objects.create(
-            code="EUR", name="Euro", decimal_places=2
-        )
-
-        cls.user_group = AccountGroup.objects.create(
-            name="User Group", owner=cls.superuser
-        )
-        cls.account_usd = Account.objects.create(
-            name="Checking USD",
-            currency=cls.currency_usd,
-            owner=cls.superuser,
-            group=cls.user_group,
-        )
-        cls.account_eur = Account.objects.create(
-            name="Savings EUR",
-            currency=cls.currency_eur,
-            owner=cls.superuser,
-            group=cls.user_group,
-        )
-
-        cls.category_food = TransactionCategory.objects.create(
-            name="Food", owner=cls.superuser
-        )
-        cls.tag_urgent = TransactionTag.objects.create(
-            name="Urgent", owner=cls.superuser
-        )
-        cls.entity_store = TransactionEntity.objects.create(
-            name="SuperStore", owner=cls.superuser
-        )
-
-        cls.transaction1 = Transaction.objects.create(
-            account=cls.account_usd,
-            owner=cls.superuser,
-            type=Transaction.Type.EXPENSE,
-            date=date(2023, 1, 10),
-            reference_date=date(2023, 1, 1),
-            amount=Decimal("50.00"),
-            description="Groceries",
-            category=cls.category_food,
-            is_paid=True,
-        )
-        cls.transaction1.tags.add(cls.tag_urgent)
-        cls.transaction1.entities.add(cls.entity_store)
-
-        cls.transaction2 = Transaction.objects.create(
-            account=cls.account_eur,
-            owner=cls.superuser,
-            type=Transaction.Type.INCOME,
-            date=date(2023, 1, 15),
-            reference_date=date(2023, 1, 1),
-            amount=Decimal("1200.00"),
-            description="Salary",
-            is_paid=True,
-        )
-
-    def setUp(self):
-        self.client = Client()
-        self.client.login(email="exportadmin@example.com", password="password")
-
-
-class ResourceExportTests(BaseExportAppTest):
-    def test_transaction_resource_export(self):
-        resource = TransactionResource()
-        queryset = Transaction.objects.filter(owner=self.superuser).order_by(
-            "pk"
-        )  # Ensure consistent order
-        dataset = resource.export(queryset=queryset)
-
-        self.assertEqual(len(dataset), 2)
-        self.assertIn("id", dataset.headers)
-        self.assertIn("account", dataset.headers)
-        self.assertIn("description", dataset.headers)
-        self.assertIn("category", dataset.headers)
-        self.assertIn("tags", dataset.headers)
-        self.assertIn("entities", dataset.headers)
-
-        exported_row1_dict = dict(zip(dataset.headers, dataset[0]))
-
-        self.assertEqual(exported_row1_dict["id"], self.transaction1.id)
-        self.assertEqual(exported_row1_dict["account"], self.account_usd.name)
-        self.assertEqual(exported_row1_dict["description"], "Groceries")
-        self.assertEqual(exported_row1_dict["category"], self.category_food.name)
-        # M2M fields order might vary, so check for presence
-        self.assertIn(self.tag_urgent.name, exported_row1_dict["tags"].split(","))
-        self.assertIn(self.entity_store.name, exported_row1_dict["entities"].split(","))
-        self.assertEqual(
-            Decimal(exported_row1_dict["amount"]), self.transaction1.amount
-        )
-
-    def test_account_resource_export(self):
-        resource = AccountResource()
-        queryset = Account.objects.filter(owner=self.superuser).order_by(
-            "name"
-        )  # Ensure consistent order
-        dataset = resource.export(queryset=queryset)
-
-        self.assertEqual(len(dataset), 2)
-        self.assertIn("id", dataset.headers)
-        self.assertIn("name", dataset.headers)
-        self.assertIn("group", dataset.headers)
-        self.assertIn("currency", dataset.headers)
-
-        # Assuming order by name, Checking USD comes first
-        exported_row_usd_dict = dict(zip(dataset.headers, dataset[0]))
-        self.assertEqual(exported_row_usd_dict["name"], self.account_usd.name)
-        self.assertEqual(exported_row_usd_dict["group"], self.user_group.name)
-        self.assertEqual(exported_row_usd_dict["currency"], self.currency_usd.name)
-
-
-class ExportViewTests(BaseExportAppTest):
-    def test_export_form_get(self):
-        response = self.client.get(reverse("export_form"))
-        self.assertEqual(response.status_code, 200)
-        self.assertIsInstance(response.context["form"], ExportForm)
-
-    def test_export_single_csv(self):
-        data = {"transactions": "on"}
-        response = self.client.post(reverse("export_form"), data)
-
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(response["Content-Type"], "text/csv")
-        self.assertTrue(
-            response["Content-Disposition"].endswith(
-                '_WYGIWYH_export_transactions.csv"'
-            )
-        )
-
-        content = response.content.decode("utf-8")
-        reader = csv.reader(io.StringIO(content))
-        headers = next(reader)
-        self.assertIn("id", headers)
-        self.assertIn("description", headers)
-
-        self.assertIn(self.transaction1.description, content)
-        self.assertIn(self.transaction2.description, content)
-
-    def test_export_multiple_to_zip(self):
-        data = {
-            "transactions": "on",
-            "accounts": "on",
-        }
-        response = self.client.post(reverse("export_form"), data)
-
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(response["Content-Type"], "application/zip")
-        self.assertTrue(
-            response["Content-Disposition"].endswith('_WYGIWYH_export.zip"')
-        )
-
-        zip_buffer = io.BytesIO(response.content)
-        with zipfile.ZipFile(zip_buffer, "r") as zf:
-            filenames = zf.namelist()
-            self.assertIn("transactions.csv", filenames)
-            self.assertIn("accounts.csv", filenames)
-
-            with zf.open("transactions.csv") as csv_file:
-                content = csv_file.read().decode("utf-8")
-                self.assertIn("id,type,date", content)
-                self.assertIn(self.transaction1.description, content)
-
-    def test_export_no_selection(self):
-        data = {}
-        response = self.client.post(reverse("export_form"), data)
-        self.assertEqual(response.status_code, 200)
-        self.assertIn(
-            "You have to select at least one export", response.content.decode()
-        )
-
-    def test_export_access_non_superuser(self):
-        normal_user = User.objects.create_user(
-            email="normal@example.com", password="password"
-        )
-        self.client.logout()
-        self.client.login(email="normal@example.com", password="password")
-
-        response = self.client.get(reverse("export_index"))
-        self.assertEqual(response.status_code, 302)
-
-        response = self.client.get(reverse("export_form"))
-        self.assertEqual(response.status_code, 302)
-
-
-class RestoreViewTests(BaseExportAppTest):
-    def test_restore_form_get(self):
-        response = self.client.get(reverse("restore_form"))
-        self.assertEqual(response.status_code, 200)
-        self.assertTemplateUsed(response, "export_app/fragments/restore.html")
-        self.assertIsInstance(response.context["form"], RestoreForm)
-
-    # Actual restore POST tests are complex due to file processing and DB interactions.
-    # A placeholder for how one might start, heavily reliant on mocking or a working DB.
-    # @patch('apps.export_app.views.process_imports')
-    # def test_restore_form_post_zip_mocked_processing(self, mock_process_imports):
-    #     zip_content = io.BytesIO()
-    #     with zipfile.ZipFile(zip_content, "w") as zf:
-    #        zf.writestr("users.csv", "id,email\n1,test@example.com") # Minimal valid CSV content
-
-    #     zip_file_upload = SimpleUploadedFile("test_restore.zip", zip_content.getvalue(), content_type="application/zip")
-    #     data = {"zip_file": zip_file_upload}
-
-    #     response = self.client.post(reverse("restore_form"), data)
-    #     self.assertEqual(response.status_code, 204) # Expecting HTMX success
-    #     mock_process_imports.assert_called_once()
-    #     # Further checks on how mock_process_imports was called could be added here.
-    pass
+# Create your tests here.

app/apps/import_app/tests.py

@@ -1,423 +1,3 @@
-import yaml
-from decimal import Decimal
-from datetime import date, datetime
-from unittest.mock import patch, MagicMock
-import os
-import tempfile
+from django.test import TestCase
 
-from django.core.exceptions import ValidationError
-from django.test import TestCase, Client
-from django.contrib.auth import get_user_model
-from django.core.files.uploadedfile import SimpleUploadedFile
-from django.urls import reverse
-
-from apps.import_app.models import ImportProfile, ImportRun
-from apps.import_app.services.v1 import ImportService
-from apps.import_app.schemas.v1 import (
-    ImportProfileSchema,
-    CSVImportSettings,
-    ColumnMapping,
-    TransactionDateMapping,
-    TransactionAmountMapping,
-    TransactionDescriptionMapping,
-    TransactionAccountMapping,
-)
-from apps.accounts.models import Account
-from apps.currencies.models import Currency
-from apps.transactions.models import (
-    Transaction,
-    TransactionCategory,
-    TransactionTag,
-    TransactionEntity,
-)
-
-# Mocking get_current_user from thread_local
-from apps.common.middleware.thread_local import get_current_user, write_current_user
-
-
-User = get_user_model()
-
-
-# --- Base Test Case ---
-class BaseImportAppTest(TestCase):
-    def setUp(self):
-        self.user = User.objects.create_user(
-            email="importer@example.com", password="password"
-        )
-        write_current_user(self.user)  # For services that rely on get_current_user
-
-        self.client = Client()
-        self.client.login(email="importer@example.com", password="password")
-
-        self.currency_usd = Currency.objects.create(code="USD", name="US Dollar")
-        self.account_usd = Account.objects.create(
-            name="Checking USD", currency=self.currency_usd, owner=self.user
-        )
-
-    def tearDown(self):
-        write_current_user(None)
-
-    def _create_valid_transaction_import_profile_yaml(
-        self, extra_settings=None, extra_mappings=None
-    ):
-        settings_dict = {
-            "file_type": "csv",
-            "delimiter": ",",
-            "skip_lines": 0,
-            "importing": "transactions",
-            "trigger_transaction_rules": False,
-            **(extra_settings or {}),
-        }
-        mappings_dict = {
-            "col_date": {
-                "target": "date",
-                "source": "DateColumn",
-                "format": "%Y-%m-%d",
-            },
-            "col_amount": {"target": "amount", "source": "AmountColumn"},
-            "col_desc": {"target": "description", "source": "DescriptionColumn"},
-            "col_acc": {
-                "target": "account",
-                "source": "AccountNameColumn",
-                "type": "name",
-            },
-            **(extra_mappings or {}),
-        }
-        return yaml.dump({"settings": settings_dict, "mapping": mappings_dict})
-
-
-# --- Model Tests ---
-class ImportProfileModelTests(BaseImportAppTest):
-    def test_import_profile_valid_yaml_clean(self):
-        valid_yaml = self._create_valid_transaction_import_profile_yaml()
-        profile = ImportProfile(
-            name="Test Valid Profile",
-            yaml_config=valid_yaml,
-            version=ImportProfile.Versions.VERSION_1,
-        )
-        try:
-            profile.full_clean()  # Should not raise ValidationError
-        except ValidationError as e:
-            self.fail(f"Valid YAML raised ValidationError: {e.message_dict}")
-
-    def test_import_profile_invalid_yaml_type_clean(self):
-        # Invalid: 'delimiter' should be string, 'skip_lines' int
-        invalid_yaml = """
-settings:
-  file_type: csv
-  delimiter: 123
-  skip_lines: "abc"
-  importing: transactions
-mapping:
-  col_date: {target: date, source: Date, format: "%Y-%m-%d"}
-"""
-        profile = ImportProfile(
-            name="Test Invalid Profile",
-            yaml_config=invalid_yaml,
-            version=ImportProfile.Versions.VERSION_1,
-        )
-        with self.assertRaises(ValidationError) as context:
-            profile.full_clean()
-        self.assertIn("yaml_config", context.exception.message_dict)
-        self.assertTrue(
-            "Input should be a valid string"
-            in str(context.exception.message_dict["yaml_config"])
-            or "Input should be a valid integer"
-            in str(context.exception.message_dict["yaml_config"])
-        )
-
-    def test_import_profile_invalid_mapping_for_import_type(self):
-        invalid_yaml = """
-settings:
-  file_type: csv
-  importing: tags
-mapping:
-  some_col: {target: account_name, source: SomeColumn}
-"""
-        profile = ImportProfile(
-            name="Invalid Mapping Type",
-            yaml_config=invalid_yaml,
-            version=ImportProfile.Versions.VERSION_1,
-        )
-        with self.assertRaises(ValidationError) as context:
-            profile.full_clean()
-        self.assertIn("yaml_config", context.exception.message_dict)
-        self.assertIn(
-            "Mapping type 'AccountNameMapping' is not allowed when importing tags",
-            str(context.exception.message_dict["yaml_config"]),
-        )
-
-
-# --- Service Tests (Focus on ImportService v1) ---
-class ImportServiceV1LogicTests(BaseImportAppTest):
-    def setUp(self):
-        super().setUp()
-        self.basic_yaml_config = self._create_valid_transaction_import_profile_yaml()
-        self.profile = ImportProfile.objects.create(
-            name="Service Test Profile", yaml_config=self.basic_yaml_config
-        )
-        self.import_run = ImportRun.objects.create(
-            profile=self.profile, file_name="test.csv"
-        )
-
-    def get_service(self):
-        self.import_run.logs = ""
-        self.import_run.save()
-        return ImportService(self.import_run)
-
-    def test_transform_value_replace(self):
-        service = self.get_service()
-        mapping_def = {"type": "replace", "pattern": "USD", "replacement": "EUR"}
-        mapping = ColumnMapping(
-            source="col", target="field", transformations=[mapping_def]
-        )
-        self.assertEqual(
-            service._transform_value("Amount USD", mapping, row={"col": "Amount USD"}),
-            "Amount EUR",
-        )
-
-    def test_transform_value_regex(self):
-        service = self.get_service()
-        mapping_def = {"type": "regex", "pattern": r"\d+", "replacement": "NUM"}
-        mapping = ColumnMapping(
-            source="col", target="field", transformations=[mapping_def]
-        )
-        self.assertEqual(
-            service._transform_value("abc123xyz", mapping, row={"col": "abc123xyz"}),
-            "abcNUMxyz",
-        )
-
-    def test_transform_value_date_format(self):
-        service = self.get_service()
-        mapping_def = {
-            "type": "date_format",
-            "original_format": "%d/%m/%Y",
-            "new_format": "%Y-%m-%d",
-        }
-        mapping = ColumnMapping(
-            source="col", target="field", transformations=[mapping_def]
-        )
-        self.assertEqual(
-            service._transform_value("15/10/2023", mapping, row={"col": "15/10/2023"}),
-            "2023-10-15",
-        )
-
-    def test_transform_value_merge(self):
-        service = self.get_service()
-        mapping_def = {"type": "merge", "fields": ["colA", "colB"], "separator": "-"}
-        mapping = ColumnMapping(
-            source="colA", target="field", transformations=[mapping_def]
-        )
-        row_data = {"colA": "ValA", "colB": "ValB"}
-        self.assertEqual(
-            service._transform_value(row_data["colA"], mapping, row_data), "ValA-ValB"
-        )
-
-    def test_transform_value_split(self):
-        service = self.get_service()
-        mapping_def = {"type": "split", "separator": "|", "index": 1}
-        mapping = ColumnMapping(
-            source="col", target="field", transformations=[mapping_def]
-        )
-        self.assertEqual(
-            service._transform_value(
-                "partA|partB|partC", mapping, row={"col": "partA|partB|partC"}
-            ),
-            "partB",
-        )
-
-    def test_coerce_type_date(self):
-        service = self.get_service()
-        mapping = TransactionDateMapping(source="col", target="date", format="%Y-%m-%d")
-        self.assertEqual(
-            service._coerce_type("2023-11-21", mapping), date(2023, 11, 21)
-        )
-
-        mapping_multi_format = TransactionDateMapping(
-            source="col", target="date", format=["%d/%m/%Y", "%Y-%m-%d"]
-        )
-        self.assertEqual(
-            service._coerce_type("21/11/2023", mapping_multi_format), date(2023, 11, 21)
-        )
-
-    def test_coerce_type_decimal(self):
-        service = self.get_service()
-        mapping = TransactionAmountMapping(source="col", target="amount")
-        self.assertEqual(service._coerce_type("123.45", mapping), Decimal("123.45"))
-        self.assertEqual(service._coerce_type("-123.45", mapping), Decimal("123.45"))
-
-    def test_coerce_type_bool(self):
-        service = self.get_service()
-        mapping = ColumnMapping(source="col", target="field", coerce_to="bool")
-        self.assertTrue(service._coerce_type("true", mapping))
-        self.assertTrue(service._coerce_type("1", mapping))
-        self.assertFalse(service._coerce_type("false", mapping))
-        self.assertFalse(service._coerce_type("0", mapping))
-
-    def test_map_row_simple(self):
-        service = self.get_service()
-        row = {
-            "DateColumn": "2023-01-15",
-            "AmountColumn": "100.50",
-            "DescriptionColumn": "Lunch",
-            "AccountNameColumn": "Checking USD",
-        }
-        with patch.object(Account.objects, "filter") as mock_filter:
-            mock_filter.return_value.first.return_value = self.account_usd
-            mapped = service._map_row(row)
-            self.assertEqual(mapped["date"], date(2023, 1, 15))
-            self.assertEqual(mapped["amount"], Decimal("100.50"))
-            self.assertEqual(mapped["description"], "Lunch")
-            self.assertEqual(mapped["account"], self.account_usd)
-
-    def test_check_duplicate_transaction_strict(self):
-        dedup_yaml = yaml.dump(
-            {
-                "settings": {"file_type": "csv", "importing": "transactions"},
-                "mapping": {
-                    "col_date": {
-                        "target": "date",
-                        "source": "Date",
-                        "format": "%Y-%m-%d",
-                    },
-                    "col_amount": {"target": "amount", "source": "Amount"},
-                    "col_desc": {"target": "description", "source": "Desc"},
-                    "col_acc": {"target": "account", "source": "Acc", "type": "name"},
-                },
-                "deduplication": [
-                    {
-                        "type": "compare",
-                        "fields": ["date", "amount", "description", "account"],
-                        "match_type": "strict",
-                    }
-                ],
-            }
-        )
-        profile = ImportProfile.objects.create(
-            name="Dedupe Profile Strict", yaml_config=dedup_yaml
-        )
-        import_run = ImportRun.objects.create(profile=profile, file_name="dedupe.csv")
-        service = ImportService(import_run)
-
-        Transaction.objects.create(
-            owner=self.user,
-            account=self.account_usd,
-            date=date(2023, 1, 1),
-            amount=Decimal("10.00"),
-            description="Coffee",
-        )
-
-        dup_data = {
-            "owner": self.user,
-            "account": self.account_usd,
-            "date": date(2023, 1, 1),
-            "amount": Decimal("10.00"),
-            "description": "Coffee",
-        }
-        self.assertTrue(service._check_duplicate_transaction(dup_data))
-
-        not_dup_data = {
-            "owner": self.user,
-            "account": self.account_usd,
-            "date": date(2023, 1, 1),
-            "amount": Decimal("10.00"),
-            "description": "Tea",
-        }
-        self.assertFalse(service._check_duplicate_transaction(not_dup_data))
-
-
-class ImportServiceFileProcessingTests(BaseImportAppTest):
-    @patch("apps.import_app.tasks.process_import.defer")
-    def test_process_csv_file_basic_transaction_import(self, mock_defer):
-        csv_content = "DateColumn,AmountColumn,DescriptionColumn,AccountNameColumn\n2023-03-10,123.45,Test CSV Import 1,Checking USD\n2023-03-11,67.89,Test CSV Import 2,Checking USD"
-        profile_yaml = self._create_valid_transaction_import_profile_yaml()
-        profile = ImportProfile.objects.create(
-            name="CSV Test Profile", yaml_config=profile_yaml
-        )
-
-        with tempfile.NamedTemporaryFile(
-            mode="w+", delete=False, suffix=".csv", dir=ImportService.TEMP_DIR
-        ) as tmp_file:
-            tmp_file.write(csv_content)
-            tmp_file_path = tmp_file.name
-
-        import_run = ImportRun.objects.create(
-            profile=profile, file_name=os.path.basename(tmp_file_path)
-        )
-        service = ImportService(import_run)
-
-        with patch.object(Account.objects, "filter") as mock_account_filter:
-            mock_account_filter.return_value.first.return_value = self.account_usd
-            service.process_file(tmp_file_path)
-
-        import_run.refresh_from_db()
-        self.assertEqual(import_run.status, ImportRun.Status.FINISHED)
-        self.assertEqual(import_run.total_rows, 2)
-        self.assertEqual(import_run.processed_rows, 2)
-        self.assertEqual(import_run.successful_rows, 2)
-
-        # DB dependent assertions commented out due to sandbox issues
-        # self.assertTrue(Transaction.objects.filter(description="Test CSV Import 1").exists())
-        # self.assertEqual(Transaction.objects.count(), 2)
-
-        if os.path.exists(tmp_file_path):
-            os.remove(tmp_file_path)
-
-
-class ImportViewTests(BaseImportAppTest):
-    def test_import_profile_list_view(self):
-        ImportProfile.objects.create(
-            name="Profile 1",
-            yaml_config=self._create_valid_transaction_import_profile_yaml(),
-        )
-        response = self.client.get(reverse("import_profile_list"))
-        self.assertEqual(response.status_code, 200)
-        self.assertContains(response, "Profile 1")
-
-    def test_import_profile_add_view_get(self):
-        response = self.client.get(reverse("import_profile_add"))
-        self.assertEqual(response.status_code, 200)
-        self.assertIsInstance(response.context["form"], ImportProfileForm)
-
-    @patch("apps.import_app.tasks.process_import.defer")
-    def test_import_run_add_view_post_valid_file(self, mock_defer):
-        profile = ImportProfile.objects.create(
-            name="Upload Profile",
-            yaml_config=self._create_valid_transaction_import_profile_yaml(),
-        )
-        csv_content = "DateColumn,AmountColumn,DescriptionColumn,AccountNameColumn\n2023-01-01,10.00,Test Upload,Checking USD"
-        uploaded_file = SimpleUploadedFile(
-            "test_upload.csv", csv_content.encode("utf-8"), content_type="text/csv"
-        )
-
-        response = self.client.post(
-            reverse("import_run_add", args=[profile.id]), {"file": uploaded_file}
-        )
-
-        self.assertEqual(response.status_code, 204)
-        self.assertTrue(
-            ImportRun.objects.filter(
-                profile=profile, file_name__contains="test_upload.csv"
-            ).exists()
-        )
-        mock_defer.assert_called_once()
-        args_list = mock_defer.call_args_list[0]
-        kwargs_passed = args_list.kwargs
-        self.assertIn("import_run_id", kwargs_passed)
-        self.assertIn("file_path", kwargs_passed)
-        self.assertEqual(kwargs_passed["user_id"], self.user.id)
-
-        run = ImportRun.objects.get(
-            profile=profile, file_name__contains="test_upload.csv"
-        )
-        temp_file_path_in_storage = os.path.join(
-            ImportService.TEMP_DIR, run.file_name
-        )  # Ensure correct path construction
-        if os.path.exists(temp_file_path_in_storage):  # Check existence before removing
-            os.remove(temp_file_path_in_storage)
-        elif os.path.exists(
-            os.path.join(ImportService.TEMP_DIR, os.path.basename(run.file_name))
-        ):  # Fallback for just basename
-            os.remove(
-                os.path.join(ImportService.TEMP_DIR, os.path.basename(run.file_name))
-            )
+# Create your tests here.

app/apps/net_worth/tests.py

@@ -1,544 +1,3 @@
-import datetime
-from decimal import Decimal
-from collections import OrderedDict
-import json  # Added for view tests
+from django.test import TestCase
 
-from django.db.models import Q
-from django.test import TestCase, Client
-from django.contrib.auth import get_user_model
-from django.utils import timezone
-from django.template.defaultfilters import date as date_filter
-from django.urls import reverse  # Added for view tests
-from dateutil.relativedelta import relativedelta  # Added for date calculations
-
-from apps.currencies.models import Currency
-from apps.accounts.models import Account, AccountGroup
-from apps.transactions.models import Transaction
-from apps.net_worth.utils.calculate_net_worth import (
-    calculate_historical_currency_net_worth,
-    calculate_historical_account_balance,
-)
-
-# Mocking get_current_user from thread_local
-from apps.common.middleware.thread_local import get_current_user, write_current_user
-from apps.common.models import SharedObject
-
-User = get_user_model()
-
-
-class BaseNetWorthTest(TestCase):
-    def setUp(self):
-        self.user = User.objects.create_user(
-            email="networthuser@example.com", password="password"
-        )
-        self.other_user = User.objects.create_user(
-            email="othernetworth@example.com", password="password"
-        )
-
-        # Set current user for thread_local middleware
-        write_current_user(self.user)
-
-        self.client = Client()
-        self.client.login(email="networthuser@example.com", password="password")
-
-        self.currency_usd = Currency.objects.create(
-            code="USD", name="US Dollar", decimal_places=2
-        )
-        self.currency_eur = Currency.objects.create(
-            code="EUR", name="Euro", decimal_places=2
-        )
-
-        self.account_group_main = AccountGroup.objects.create(
-            name="Main Group", owner=self.user
-        )
-
-        self.account_usd_1 = Account.objects.create(
-            name="USD Account 1",
-            currency=self.currency_usd,
-            owner=self.user,
-            group=self.account_group_main,
-        )
-        self.account_usd_2 = Account.objects.create(
-            name="USD Account 2",
-            currency=self.currency_usd,
-            owner=self.user,
-            group=self.account_group_main,
-        )
-        self.account_eur_1 = Account.objects.create(
-            name="EUR Account 1",
-            currency=self.currency_eur,
-            owner=self.user,
-            group=self.account_group_main,
-        )
-        # Public account for visibility tests
-        self.account_public_usd = Account.objects.create(
-            name="Public USD Account",
-            currency=self.currency_usd,
-            visibility=SharedObject.Visibility.public,
-        )
-
-    def tearDown(self):
-        # Clear current user
-        write_current_user(None)
-
-
-class CalculateNetWorthUtilsTests(BaseNetWorthTest):
-    def test_calculate_historical_currency_net_worth_no_transactions(self):
-        qs = Transaction.objects.none()
-        result = calculate_historical_currency_net_worth(qs)
-
-        current_month_str = date_filter(timezone.localdate(timezone.now()), "b Y")
-        next_month_str = date_filter(
-            timezone.localdate(timezone.now()) + relativedelta(months=1), "b Y"
-        )
-
-        self.assertIn(current_month_str, result)
-        self.assertIn(next_month_str, result)
-
-        expected_currencies_present = {
-            "US Dollar",
-            "Euro",
-        }  # Based on created accounts for self.user
-        actual_currencies_in_result = set()
-        if (
-            result and result[current_month_str]
-        ):  # Check if current_month_str key exists and has data
-            actual_currencies_in_result = set(result[current_month_str].keys())
-
-        self.assertTrue(
-            expected_currencies_present.issubset(actual_currencies_in_result)
-            or not result[current_month_str]
-        )
-
-    def test_calculate_historical_currency_net_worth_single_currency(self):
-        Transaction.objects.create(
-            account=self.account_usd_1,
-            owner=self.user,
-            type=Transaction.Type.INCOME,
-            amount=Decimal("1000"),
-            date=datetime.date(2023, 10, 5),
-            reference_date=datetime.date(2023, 10, 1),
-            is_paid=True,
-        )
-        Transaction.objects.create(
-            account=self.account_usd_1,
-            owner=self.user,
-            type=Transaction.Type.EXPENSE,
-            amount=Decimal("200"),
-            date=datetime.date(2023, 10, 15),
-            reference_date=datetime.date(2023, 10, 1),
-            is_paid=True,
-        )
-        Transaction.objects.create(
-            account=self.account_usd_2,
-            owner=self.user,
-            type=Transaction.Type.INCOME,
-            amount=Decimal("300"),
-            date=datetime.date(2023, 11, 5),
-            reference_date=datetime.date(2023, 11, 1),
-            is_paid=True,
-        )
-
-        qs = Transaction.objects.filter(
-            owner=self.user, account__currency=self.currency_usd
-        )
-        result = calculate_historical_currency_net_worth(qs)
-
-        oct_str = date_filter(datetime.date(2023, 10, 1), "b Y")
-        nov_str = date_filter(datetime.date(2023, 11, 1), "b Y")
-        dec_str = date_filter(datetime.date(2023, 12, 1), "b Y")
-
-        self.assertIn(oct_str, result)
-        self.assertEqual(result[oct_str]["US Dollar"], Decimal("800.00"))
-
-        self.assertIn(nov_str, result)
-        self.assertEqual(result[nov_str]["US Dollar"], Decimal("1100.00"))
-
-        self.assertIn(dec_str, result)
-        self.assertEqual(result[dec_str]["US Dollar"], Decimal("1100.00"))
-
-    def test_calculate_historical_currency_net_worth_multi_currency(self):
-        Transaction.objects.create(
-            account=self.account_usd_1,
-            owner=self.user,
-            type=Transaction.Type.INCOME,
-            amount=Decimal("1000"),
-            date=datetime.date(2023, 10, 5),
-            reference_date=datetime.date(2023, 10, 1),
-            is_paid=True,
-        )
-        Transaction.objects.create(
-            account=self.account_eur_1,
-            owner=self.user,
-            type=Transaction.Type.INCOME,
-            amount=Decimal("500"),
-            date=datetime.date(2023, 10, 10),
-            reference_date=datetime.date(2023, 10, 1),
-            is_paid=True,
-        )
-        Transaction.objects.create(
-            account=self.account_usd_1,
-            owner=self.user,
-            type=Transaction.Type.EXPENSE,
-            amount=Decimal("100"),
-            date=datetime.date(2023, 11, 5),
-            reference_date=datetime.date(2023, 11, 1),
-            is_paid=True,
-        )
-        Transaction.objects.create(
-            account=self.account_eur_1,
-            owner=self.user,
-            type=Transaction.Type.INCOME,
-            amount=Decimal("50"),
-            date=datetime.date(2023, 11, 15),
-            reference_date=datetime.date(2023, 11, 1),
-            is_paid=True,
-        )
-
-        qs = Transaction.objects.filter(owner=self.user)
-        result = calculate_historical_currency_net_worth(qs)
-
-        oct_str = date_filter(datetime.date(2023, 10, 1), "b Y")
-        nov_str = date_filter(datetime.date(2023, 11, 1), "b Y")
-
-        self.assertEqual(result[oct_str]["US Dollar"], Decimal("1000.00"))
-        self.assertEqual(result[oct_str]["Euro"], Decimal("500.00"))
-        self.assertEqual(result[nov_str]["US Dollar"], Decimal("900.00"))
-        self.assertEqual(result[nov_str]["Euro"], Decimal("550.00"))
-
-    def test_calculate_historical_currency_net_worth_public_account_visibility(self):
-        Transaction.objects.create(
-            account=self.account_usd_1,
-            owner=self.user,
-            type=Transaction.Type.INCOME,
-            amount=Decimal("100"),
-            date=datetime.date(2023, 10, 1),
-            reference_date=datetime.date(2023, 10, 1),
-            is_paid=True,
-        )
-        Transaction.objects.create(
-            account=self.account_public_usd,
-            type=Transaction.Type.INCOME,
-            amount=Decimal("200"),
-            date=datetime.date(2023, 10, 1),
-            reference_date=datetime.date(2023, 10, 1),
-            is_paid=True,
-        )
-
-        qs = Transaction.objects.filter(
-            Q(owner=self.user) | Q(account__visibility=SharedObject.Visibility.public)
-        )
-        result = calculate_historical_currency_net_worth(qs)
-        oct_str = date_filter(datetime.date(2023, 10, 1), "b Y")
-
-        self.assertEqual(result[oct_str]["US Dollar"], Decimal("300.00"))
-
-    def test_calculate_historical_account_balance_no_transactions(self):
-        qs = Transaction.objects.none()
-        result = calculate_historical_account_balance(qs)
-        current_month_str = date_filter(timezone.localdate(timezone.now()), "b Y")
-        next_month_str = date_filter(
-            timezone.localdate(timezone.now()) + relativedelta(months=1), "b Y"
-        )
-
-        self.assertIn(current_month_str, result)
-        self.assertIn(next_month_str, result)
-        if result and result[current_month_str]:
-            for account_name in [
-                self.account_usd_1.name,
-                self.account_eur_1.name,
-                self.account_public_usd.name,
-            ]:
-                self.assertEqual(
-                    result[current_month_str].get(account_name, Decimal(0)),
-                    Decimal("0.00"),
-                )
-
-    def test_calculate_historical_account_balance_single_account(self):
-        Transaction.objects.create(
-            account=self.account_usd_1,
-            owner=self.user,
-            type=Transaction.Type.INCOME,
-            amount=Decimal("1000"),
-            date=datetime.date(2023, 10, 5),
-            reference_date=datetime.date(2023, 10, 1),
-            is_paid=True,
-        )
-        Transaction.objects.create(
-            account=self.account_usd_1,
-            owner=self.user,
-            type=Transaction.Type.EXPENSE,
-            amount=Decimal("200"),
-            date=datetime.date(2023, 10, 15),
-            reference_date=datetime.date(2023, 10, 1),
-            is_paid=True,
-        )
-        Transaction.objects.create(
-            account=self.account_usd_1,
-            owner=self.user,
-            type=Transaction.Type.INCOME,
-            amount=Decimal("50"),
-            date=datetime.date(2023, 11, 5),
-            reference_date=datetime.date(2023, 11, 1),
-            is_paid=True,
-        )
-
-        qs = Transaction.objects.filter(account=self.account_usd_1)
-        result = calculate_historical_account_balance(qs)
-
-        oct_str = date_filter(datetime.date(2023, 10, 1), "b Y")
-        nov_str = date_filter(datetime.date(2023, 11, 1), "b Y")
-
-        self.assertEqual(result[oct_str][self.account_usd_1.name], Decimal("800.00"))
-        self.assertEqual(result[nov_str][self.account_usd_1.name], Decimal("850.00"))
-
-    def test_calculate_historical_account_balance_multiple_accounts(self):
-        Transaction.objects.create(
-            account=self.account_usd_1,
-            owner=self.user,
-            type=Transaction.Type.INCOME,
-            amount=Decimal("100"),
-            date=datetime.date(2023, 10, 1),
-            reference_date=datetime.date(2023, 10, 1),
-            is_paid=True,
-        )
-        Transaction.objects.create(
-            account=self.account_eur_1,
-            owner=self.user,
-            type=Transaction.Type.INCOME,
-            amount=Decimal("200"),
-            date=datetime.date(2023, 10, 1),
-            reference_date=datetime.date(2023, 10, 1),
-            is_paid=True,
-        )
-        Transaction.objects.create(
-            account=self.account_usd_1,
-            owner=self.user,
-            type=Transaction.Type.EXPENSE,
-            amount=Decimal("30"),
-            date=datetime.date(2023, 11, 1),
-            reference_date=datetime.date(2023, 11, 1),
-            is_paid=True,
-        )
-
-        qs = Transaction.objects.filter(owner=self.user)
-        result = calculate_historical_account_balance(qs)
-        oct_str = date_filter(datetime.date(2023, 10, 1), "b Y")
-        nov_str = date_filter(datetime.date(2023, 11, 1), "b Y")
-
-        self.assertEqual(result[oct_str][self.account_usd_1.name], Decimal("100.00"))
-        self.assertEqual(result[oct_str][self.account_eur_1.name], Decimal("200.00"))
-        self.assertEqual(result[nov_str][self.account_usd_1.name], Decimal("70.00"))
-        self.assertEqual(result[nov_str][self.account_eur_1.name], Decimal("200.00"))
-
-    def test_date_range_handling_in_utils(self):
-        qs_empty = Transaction.objects.none()
-        today = timezone.localdate(timezone.now())
-        start_of_this_month_str = date_filter(today.replace(day=1), "b Y")
-        start_of_next_month_str = date_filter(
-            (today.replace(day=1) + relativedelta(months=1)), "b Y"
-        )
-
-        currency_result = calculate_historical_currency_net_worth(qs_empty)
-        self.assertIn(start_of_this_month_str, currency_result)
-        self.assertIn(start_of_next_month_str, currency_result)
-
-        account_result = calculate_historical_account_balance(qs_empty)
-        self.assertIn(start_of_this_month_str, account_result)
-        self.assertIn(start_of_next_month_str, account_result)
-
-    def test_archived_account_exclusion_in_currency_net_worth(self):
-        archived_usd_acc = Account.objects.create(
-            name="Archived USD",
-            currency=self.currency_usd,
-            owner=self.user,
-            is_archived=True,
-        )
-        Transaction.objects.create(
-            account=self.account_usd_1,
-            owner=self.user,
-            type=Transaction.Type.INCOME,
-            amount=Decimal("100"),
-            date=datetime.date(2023, 10, 1),
-            reference_date=datetime.date(2023, 10, 1),
-            is_paid=True,
-        )
-        Transaction.objects.create(
-            account=archived_usd_acc,
-            owner=self.user,
-            type=Transaction.Type.INCOME,
-            amount=Decimal("500"),
-            date=datetime.date(2023, 10, 1),
-            reference_date=datetime.date(2023, 10, 1),
-            is_paid=True,
-        )
-
-        qs = Transaction.objects.filter(owner=self.user, account__is_archived=False)
-        result = calculate_historical_currency_net_worth(qs)
-        oct_str = date_filter(datetime.date(2023, 10, 1), "b Y")
-
-        if oct_str in result:
-            self.assertEqual(
-                result[oct_str].get("US Dollar", Decimal(0)), Decimal("100.00")
-            )
-        elif result:
-            self.fail(f"{oct_str} not found in result, but other data exists.")
-
-    def test_archived_account_exclusion_in_account_balance(self):
-        archived_usd_acc = Account.objects.create(
-            name="Archived USD Acct Bal",
-            currency=self.currency_usd,
-            owner=self.user,
-            is_archived=True,
-        )
-        Transaction.objects.create(
-            account=self.account_usd_1,
-            owner=self.user,
-            type=Transaction.Type.INCOME,
-            amount=Decimal("100"),
-            date=datetime.date(2023, 10, 1),
-            reference_date=datetime.date(2023, 10, 1),
-            is_paid=True,
-        )
-        Transaction.objects.create(
-            account=archived_usd_acc,
-            owner=self.user,
-            type=Transaction.Type.INCOME,
-            amount=Decimal("500"),
-            date=datetime.date(2023, 10, 1),
-            reference_date=datetime.date(2023, 10, 1),
-            is_paid=True,
-        )
-
-        qs = Transaction.objects.filter(owner=self.user)
-        result = calculate_historical_account_balance(qs)
-        oct_str = date_filter(datetime.date(2023, 10, 1), "b Y")
-
-        if oct_str in result:
-            self.assertIn(self.account_usd_1.name, result[oct_str])
-            self.assertEqual(
-                result[oct_str][self.account_usd_1.name], Decimal("100.00")
-            )
-            self.assertNotIn(archived_usd_acc.name, result[oct_str])
-        elif result:
-            self.fail(
-                f"{oct_str} not found in result for account balance, but other data exists."
-            )
-
-
-class NetWorthViewTests(BaseNetWorthTest):
-    def test_net_worth_current_view(self):
-        Transaction.objects.create(
-            account=self.account_usd_1,
-            owner=self.user,
-            type=Transaction.Type.INCOME,
-            amount=Decimal("1200.50"),
-            date=datetime.date(2023, 10, 5),
-            reference_date=datetime.date(2023, 10, 1),
-            is_paid=True,
-        )
-        Transaction.objects.create(
-            account=self.account_eur_1,
-            owner=self.user,
-            type=Transaction.Type.INCOME,
-            amount=Decimal("800.75"),
-            date=datetime.date(2023, 10, 10),
-            reference_date=datetime.date(2023, 10, 1),
-            is_paid=True,
-        )
-        Transaction.objects.create(
-            account=self.account_usd_2,
-            owner=self.user,
-            type=Transaction.Type.INCOME,
-            amount=Decimal("300.00"),
-            date=datetime.date(2023, 9, 1),
-            reference_date=datetime.date(2023, 9, 1),
-            is_paid=False,
-        )  # This is unpaid
-
-        response = self.client.get(reverse("net_worth_current"))
-        self.assertEqual(response.status_code, 200)
-        self.assertTemplateUsed(response, "net_worth/net_worth.html")
-
-        # Current net worth display should only include paid transactions
-        self.assertContains(response, "US Dollar")
-        self.assertContains(response, "1,200.50")
-        self.assertContains(response, "Euro")
-        self.assertContains(response, "800.75")
-
-        chart_data_currency_json = response.context.get("chart_data_currency_json")
-        self.assertIsNotNone(chart_data_currency_json)
-        chart_data_currency = json.loads(chart_data_currency_json)
-        self.assertIn("labels", chart_data_currency)
-        self.assertIn("datasets", chart_data_currency)
-
-        # Historical chart data in net_worth_current view uses a queryset that is NOT filtered by is_paid.
-        sep_str = date_filter(datetime.date(2023, 9, 1), "b Y")
-        if sep_str in chart_data_currency["labels"]:
-            usd_dataset = next(
-                (
-                    ds
-                    for ds in chart_data_currency["datasets"]
-                    if ds["label"] == "US Dollar"
-                ),
-                None,
-            )
-            self.assertIsNotNone(usd_dataset)
-            sep_idx = chart_data_currency["labels"].index(sep_str)
-            # The $300 from Sep (account_usd_2) should be part of the historical calculation for the chart
-            self.assertEqual(usd_dataset["data"][sep_idx], 300.00)
-
-    def test_net_worth_projected_view(self):
-        Transaction.objects.create(
-            account=self.account_usd_1,
-            owner=self.user,
-            type=Transaction.Type.INCOME,
-            amount=Decimal("1000"),
-            date=datetime.date(2023, 10, 5),
-            reference_date=datetime.date(2023, 10, 1),
-            is_paid=True,
-        )
-        Transaction.objects.create(
-            account=self.account_usd_2,
-            owner=self.user,
-            type=Transaction.Type.INCOME,
-            amount=Decimal("500"),
-            date=datetime.date(2023, 11, 1),
-            reference_date=datetime.date(2023, 11, 1),
-            is_paid=False,
-        )  # Unpaid
-
-        response = self.client.get(reverse("net_worth_projected"))
-        self.assertEqual(response.status_code, 200)
-        self.assertTemplateUsed(response, "net_worth/net_worth.html")
-
-        # `currency_net_worth` in projected view also uses a queryset NOT filtered by is_paid when calling `calculate_currency_totals`.
-        self.assertContains(response, "US Dollar")
-        self.assertContains(response, "1,500.00")  # 1000 (paid) + 500 (unpaid)
-
-        chart_data_currency_json = response.context.get("chart_data_currency_json")
-        self.assertIsNotNone(chart_data_currency_json)
-        chart_data_currency = json.loads(chart_data_currency_json)
-        self.assertIn("labels", chart_data_currency)
-        self.assertIn("datasets", chart_data_currency)
-
-        nov_str = date_filter(datetime.date(2023, 11, 1), "b Y")
-        oct_str = date_filter(datetime.date(2023, 10, 1), "b Y")
-
-        if nov_str in chart_data_currency["labels"]:
-            usd_dataset = next(
-                (
-                    ds
-                    for ds in chart_data_currency["datasets"]
-                    if ds["label"] == "US Dollar"
-                ),
-                None,
-            )
-            if usd_dataset:
-                nov_idx = chart_data_currency["labels"].index(nov_str)
-                # Value in Nov should be cumulative: 1000 (from Oct) + 500 (from Nov unpaid)
-                self.assertEqual(usd_dataset["data"][nov_idx], 1500.00)
-                # Check October value if it also exists
-                if oct_str in chart_data_currency["labels"]:
-                    oct_idx = chart_data_currency["labels"].index(oct_str)
-                    self.assertEqual(usd_dataset["data"][oct_idx], 1000.00)
+# Create your tests here.

app/apps/transactions/forms.py

@@ -7,6 +7,7 @@ from crispy_forms.layout import (
     Column,
     Field,
     Div,
+    HTML,
 )
 from django import forms
 from django.db.models import Q
@@ -29,8 +30,8 @@ from apps.transactions.models import (
     InstallmentPlan,
     RecurringTransaction,
     TransactionEntity,
+    QuickTransaction,
 )
-from apps.common.middleware.thread_local import get_current_user
 
 
 class TransactionForm(forms.ModelForm):
@@ -247,6 +248,140 @@ class TransactionForm(forms.ModelForm):
         return instance
 
 
+class QuickTransactionForm(forms.ModelForm):
+    category = DynamicModelChoiceField(
+        create_field="name",
+        model=TransactionCategory,
+        required=False,
+        label=_("Category"),
+        queryset=TransactionCategory.objects.filter(active=True),
+    )
+    tags = DynamicModelMultipleChoiceField(
+        model=TransactionTag,
+        to_field_name="name",
+        create_field="name",
+        required=False,
+        label=_("Tags"),
+        queryset=TransactionTag.objects.filter(active=True),
+    )
+    entities = DynamicModelMultipleChoiceField(
+        model=TransactionEntity,
+        to_field_name="name",
+        create_field="name",
+        required=False,
+        label=_("Entities"),
+    )
+    account = forms.ModelChoiceField(
+        queryset=Account.objects.filter(is_archived=False),
+        label=_("Account"),
+        widget=TomSelect(clear_button=False, group_by="group"),
+    )
+
+    class Meta:
+        model = QuickTransaction
+        fields = [
+            "name",
+            "account",
+            "type",
+            "is_paid",
+            "amount",
+            "description",
+            "notes",
+            "category",
+            "tags",
+            "entities",
+        ]
+        widgets = {
+            "notes": forms.Textarea(attrs={"rows": 3}),
+            "account": TomSelect(clear_button=False, group_by="group"),
+        }
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        # if editing a transaction display non-archived items and it's own item even if it's archived
+        if self.instance.id:
+            self.fields["account"].queryset = Account.objects.filter(
+                Q(is_archived=False) | Q(transactions=self.instance.id),
+            )
+
+            self.fields["category"].queryset = TransactionCategory.objects.filter(
+                Q(active=True) | Q(transaction=self.instance.id)
+            )
+
+            self.fields["tags"].queryset = TransactionTag.objects.filter(
+                Q(active=True) | Q(transaction=self.instance.id)
+            )
+
+            self.fields["entities"].queryset = TransactionEntity.objects.filter(
+                Q(active=True) | Q(transactions=self.instance.id)
+            )
+        else:
+            self.fields["account"].queryset = Account.objects.filter(
+                is_archived=False,
+            )
+
+            self.fields["category"].queryset = TransactionCategory.objects.filter(
+                active=True
+            )
+            self.fields["tags"].queryset = TransactionTag.objects.filter(active=True)
+            self.fields["entities"].queryset = TransactionEntity.objects.all()
+
+        self.helper = FormHelper()
+        self.helper.form_tag = False
+        self.helper.form_method = "post"
+        self.helper.layout = Layout(
+            Field(
+                "type",
+                template="transactions/widgets/income_expense_toggle_buttons.html",
+            ),
+            Field("is_paid", template="transactions/widgets/paid_toggle_button.html"),
+            "name",
+            HTML("<hr />"),
+            Row(
+                Column("account", css_class="form-group col-md-6 mb-0"),
+                Column("entities", css_class="form-group col-md-6 mb-0"),
+                css_class="form-row",
+            ),
+            Row(
+                Column(Field("date"), css_class="form-group col-md-6 mb-0"),
+                Column(Field("reference_date"), css_class="form-group col-md-6 mb-0"),
+                css_class="form-row",
+            ),
+            "description",
+            Field("amount", inputmode="decimal"),
+            Row(
+                Column("category", css_class="form-group col-md-6 mb-0"),
+                Column("tags", css_class="form-group col-md-6 mb-0"),
+                css_class="form-row",
+            ),
+            "notes",
+        )
+
+        if self.instance and self.instance.pk:
+            decimal_places = self.instance.account.currency.decimal_places
+            self.fields["amount"].widget = ArbitraryDecimalDisplayNumberInput(
+                decimal_places=decimal_places
+            )
+            self.helper.layout.append(
+                FormActions(
+                    NoClassSubmit(
+                        "submit", _("Update"), css_class="btn btn-outline-primary w-100"
+                    ),
+                ),
+            )
+        else:
+            self.fields["amount"].widget = ArbitraryDecimalDisplayNumberInput()
+            self.helper.layout.append(
+                Div(
+                    NoClassSubmit(
+                        "submit", _("Add"), css_class="btn btn-outline-primary"
+                    ),
+                    css_class="d-grid gap-2",
+                ),
+            )
+
+
 class BulkEditTransactionForm(TransactionForm):
     is_paid = forms.NullBooleanField(required=False)
 

app/apps/transactions/migrations/0043_quicktransaction.py

@@ -0,0 +1,45 @@
+# Generated by Django 5.1.11 on 2025-06-20 03:57
+
+import apps.transactions.validators
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0014_alter_account_options_alter_accountgroup_options'),
+        ('transactions', '0042_alter_transactioncategory_options_and_more'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='QuickTransaction',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=100, verbose_name='Name')),
+                ('type', models.CharField(choices=[('IN', 'Income'), ('EX', 'Expense')], default='EX', max_length=2, verbose_name='Type')),
+                ('is_paid', models.BooleanField(default=True, verbose_name='Paid')),
+                ('amount', models.DecimalField(decimal_places=30, max_digits=42, validators=[apps.transactions.validators.validate_non_negative, apps.transactions.validators.validate_decimal_places], verbose_name='Amount')),
+                ('description', models.CharField(blank=True, max_length=500, verbose_name='Description')),
+                ('notes', models.TextField(blank=True, verbose_name='Notes')),
+                ('internal_note', models.TextField(blank=True, verbose_name='Internal Note')),
+                ('internal_id', models.TextField(blank=True, null=True, unique=True, verbose_name='Internal ID')),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+                ('account', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='quick_transactions', to='accounts.account', verbose_name='Account')),
+                ('category', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='transactions.transactioncategory', verbose_name='Category')),
+                ('entities', models.ManyToManyField(blank=True, related_name='quick_transactions', to='transactions.transactionentity', verbose_name='Entities')),
+                ('owner', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='%(class)s_owned', to=settings.AUTH_USER_MODEL)),
+                ('tags', models.ManyToManyField(blank=True, to='transactions.transactiontag', verbose_name='Tags')),
+            ],
+            options={
+                'verbose_name': 'Quick Transaction',
+                'verbose_name_plural': 'Quick Transactions',
+                'db_table': 'quick_transactions',
+                'default_manager_name': 'objects',
+            },
+        ),
+    ]

app/apps/transactions/migrations/0044_alter_quicktransaction_unique_together.py

@@ -0,0 +1,19 @@
+# Generated by Django 5.1.11 on 2025-06-20 04:02
+
+from django.conf import settings
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('transactions', '0043_quicktransaction'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.AlterUniqueTogether(
+            name='quicktransaction',
+            unique_together={('name', 'owner')},
+        ),
+    ]

app/apps/transactions/models.py

@@ -16,7 +16,12 @@ from apps.common.templatetags.decimal import localize_number, drop_trailing_zero
 from apps.currencies.utils.convert import convert
 from apps.transactions.validators import validate_decimal_places, validate_non_negative
 from apps.common.middleware.thread_local import get_current_user
-from apps.common.models import SharedObject, SharedObjectManager, OwnedObject
+from apps.common.models import (
+    SharedObject,
+    SharedObjectManager,
+    OwnedObject,
+    OwnedObjectManager,
+)
 
 logger = logging.getLogger()
 
@@ -886,3 +891,86 @@ class RecurringTransaction(models.Model):
         """
         today = timezone.localdate(timezone.now())
         self.transactions.filter(is_paid=False, date__gt=today).delete()
+
+
+class QuickTransaction(OwnedObject):
+    class Type(models.TextChoices):
+        INCOME = "IN", _("Income")
+        EXPENSE = "EX", _("Expense")
+
+    name = models.CharField(
+        max_length=100,
+        null=False,
+        blank=False,
+        verbose_name=_("Name"),
+    )
+
+    account = models.ForeignKey(
+        "accounts.Account",
+        on_delete=models.CASCADE,
+        verbose_name=_("Account"),
+        related_name="quick_transactions",
+    )
+    type = models.CharField(
+        max_length=2,
+        choices=Type,
+        default=Type.EXPENSE,
+        verbose_name=_("Type"),
+    )
+    is_paid = models.BooleanField(default=True, verbose_name=_("Paid"))
+
+    amount = models.DecimalField(
+        max_digits=42,
+        decimal_places=30,
+        verbose_name=_("Amount"),
+        validators=[validate_non_negative, validate_decimal_places],
+    )
+
+    description = models.CharField(
+        max_length=500, verbose_name=_("Description"), blank=True
+    )
+    notes = models.TextField(blank=True, verbose_name=_("Notes"))
+    category = models.ForeignKey(
+        TransactionCategory,
+        on_delete=models.SET_NULL,
+        verbose_name=_("Category"),
+        blank=True,
+        null=True,
+    )
+    tags = models.ManyToManyField(
+        TransactionTag,
+        verbose_name=_("Tags"),
+        blank=True,
+    )
+    entities = models.ManyToManyField(
+        TransactionEntity,
+        verbose_name=_("Entities"),
+        blank=True,
+        related_name="quick_transactions",
+    )
+
+    internal_note = models.TextField(blank=True, verbose_name=_("Internal Note"))
+    internal_id = models.TextField(
+        blank=True, null=True, unique=True, verbose_name=_("Internal ID")
+    )
+
+    created_at = models.DateTimeField(auto_now_add=True)
+    updated_at = models.DateTimeField(auto_now=True)
+
+    objects = OwnedObjectManager()
+    all_objects = models.Manager()  # Unfiltered manager
+
+    class Meta:
+        verbose_name = _("Quick Transaction")
+        verbose_name_plural = _("Quick Transactions")
+        unique_together = ("name", "owner")
+        db_table = "quick_transactions"
+        default_manager_name = "objects"
+
+    def save(self, *args, **kwargs):
+        self.amount = truncate_decimal(
+            value=self.amount, decimal_places=self.account.currency.decimal_places
+        )
+
+        self.full_clean()
+        super().save(*args, **kwargs)

app/apps/transactions/tests.py

@@ -2,365 +2,60 @@ import datetime
 from decimal import Decimal
 from datetime import date, timedelta
 
-from django.test import TestCase, Client
-from django.urls import reverse
-from django.contrib.auth import get_user_model
+from django.test import TestCase
 from django.core.exceptions import ValidationError
 from django.utils import timezone
-from decimal import Decimal
-import datetime  # Import was missing
 
 from apps.transactions.models import (
     TransactionCategory,
     TransactionTag,
-    TransactionEntity,  # Added
     Transaction,
     InstallmentPlan,
     RecurringTransaction,
 )
 from apps.accounts.models import Account, AccountGroup
 from apps.currencies.models import Currency, ExchangeRate
-from apps.common.models import SharedObject
-
-User = get_user_model()
 
 
-class BaseTransactionAppTest(TestCase):
+class TransactionCategoryTests(TestCase):
+    def test_category_creation(self):
+        """Test basic category creation"""
+        category = TransactionCategory.objects.create(name="Groceries")
+        self.assertEqual(str(category), "Groceries")
+        self.assertFalse(category.mute)
+
+
+class TransactionTagTests(TestCase):
+    def test_tag_creation(self):
+        """Test basic tag creation"""
+        tag = TransactionTag.objects.create(name="Essential")
+        self.assertEqual(str(tag), "Essential")
+
+
+class TransactionTests(TestCase):
     def setUp(self):
-        self.user = User.objects.create_user(
-            email="testuser@example.com", password="password"
-        )
-        self.other_user = User.objects.create_user(
-            email="otheruser@example.com", password="password"
-        )
-        self.client = Client()
-        self.client.login(email="testuser@example.com", password="password")
-
+        """Set up test data"""
         self.currency = Currency.objects.create(
             code="USD", name="US Dollar", decimal_places=2, prefix="$ "
         )
-        self.account_group = AccountGroup.objects.create(
-            name="Test Group", owner=self.user
-        )
+        self.account_group = AccountGroup.objects.create(name="Test Group")
         self.account = Account.objects.create(
-            name="Test Account",
-            group=self.account_group,
-            currency=self.currency,
-            owner=self.user,
-        )
-
-
-class TransactionCategoryTests(BaseTransactionAppTest):
-    def test_category_creation(self):
-        """Test basic category creation by a user."""
-        category = TransactionCategory.objects.create(name="Groceries", owner=self.user)
-        self.assertEqual(str(category), "Groceries")
-        self.assertFalse(category.mute)
-        self.assertTrue(category.active)
-        self.assertEqual(category.owner, self.user)
-
-    def test_category_creation_view(self):
-        response = self.client.post(
-            reverse("category_add"), {"name": "Utilities", "active": "on"}
-        )
-        self.assertEqual(response.status_code, 204)  # HTMX success, no content
-        self.assertTrue(
-            TransactionCategory.objects.filter(
-                name="Utilities", owner=self.user
-            ).exists()
-        )
-
-    def test_category_edit_view(self):
-        category = TransactionCategory.objects.create(
-            name="Initial Name", owner=self.user
-        )
-        response = self.client.post(
-            reverse("category_edit", args=[category.id]),
-            {"name": "Updated Name", "mute": "on", "active": "on"},
-        )
-        self.assertEqual(response.status_code, 204)
-        category.refresh_from_db()
-        self.assertEqual(category.name, "Updated Name")
-        self.assertTrue(category.mute)
-
-    def test_category_delete_view(self):
-        category = TransactionCategory.objects.create(name="To Delete", owner=self.user)
-        response = self.client.delete(reverse("category_delete", args=[category.id]))
-        self.assertEqual(response.status_code, 204)
-        self.assertFalse(
-            TransactionCategory.all_objects.filter(id=category.id).exists()
-        )  # all_objects to check even if soft deleted by mistake
-
-    def test_other_user_cannot_edit_category(self):
-        category = TransactionCategory.objects.create(
-            name="User1s Category", owner=self.user
-        )
-        self.client.logout()
-        self.client.login(email="otheruser@example.com", password="password")
-        response = self.client.post(
-            reverse("category_edit", args=[category.id]), {"name": "Attempted Update"}
-        )
-        # This should return a 204 with a message, not a 403, as per view logic for owned objects
-        self.assertEqual(response.status_code, 204)
-        category.refresh_from_db()
-        self.assertEqual(category.name, "User1s Category")  # Name should not change
-
-    def test_category_sharing_and_visibility(self):
-        category = TransactionCategory.objects.create(
-            name="Shared Cat",
-            owner=self.user,
-            visibility=SharedObject.Visibility.private,
-        )
-        category.shared_with.add(self.other_user)
-
-        # Other user should be able to see it (though not directly tested here, view logic would permit)
-        # Test that owner can still edit
-        response = self.client.post(
-            reverse("category_edit", args=[category.id]),
-            {"name": "Owner Edited Shared Cat", "active": "on"},
-        )
-        self.assertEqual(response.status_code, 204)
-        category.refresh_from_db()
-        self.assertEqual(category.name, "Owner Edited Shared Cat")
-
-        # Test other user cannot delete if not owner
-        self.client.logout()
-        self.client.login(email="otheruser@example.com", password="password")
-        response = self.client.delete(
-            reverse("category_delete", args=[category.id])
-        )  # This removes user from shared_with
-        self.assertEqual(response.status_code, 204)
-        category.refresh_from_db()
-        self.assertTrue(TransactionCategory.all_objects.filter(id=category.id).exists())
-        self.assertNotIn(self.other_user, category.shared_with.all())
-
-
-class TransactionTagTests(BaseTransactionAppTest):
-    def test_tag_creation(self):
-        """Test basic tag creation by a user."""
-        tag = TransactionTag.objects.create(name="Essential", owner=self.user)
-        self.assertEqual(str(tag), "Essential")
-        self.assertTrue(tag.active)
-        self.assertEqual(tag.owner, self.user)
-
-    def test_tag_creation_view(self):
-        response = self.client.post(
-            reverse("tag_add"), {"name": "Vacation", "active": "on"}
-        )
-        self.assertEqual(response.status_code, 204)
-        self.assertTrue(
-            TransactionTag.objects.filter(name="Vacation", owner=self.user).exists()
-        )
-
-    def test_tag_edit_view(self):
-        tag = TransactionTag.objects.create(name="Old Tag", owner=self.user)
-        response = self.client.post(
-            reverse("tag_edit", args=[tag.id]), {"name": "New Tag", "active": "on"}
-        )
-        self.assertEqual(response.status_code, 204)
-        tag.refresh_from_db()
-        self.assertEqual(tag.name, "New Tag")
-
-    def test_tag_delete_view(self):
-        tag = TransactionTag.objects.create(name="Delete Me Tag", owner=self.user)
-        response = self.client.delete(reverse("tag_delete", args=[tag.id]))
-        self.assertEqual(response.status_code, 204)
-        self.assertFalse(TransactionTag.all_objects.filter(id=tag.id).exists())
-
-
-class TransactionEntityTests(BaseTransactionAppTest):
-    def test_entity_creation(self):
-        """Test basic entity creation by a user."""
-        entity = TransactionEntity.objects.create(name="Supermarket X", owner=self.user)
-        self.assertEqual(str(entity), "Supermarket X")
-        self.assertTrue(entity.active)
-        self.assertEqual(entity.owner, self.user)
-
-    def test_entity_creation_view(self):
-        response = self.client.post(
-            reverse("entity_add"), {"name": "Online Store", "active": "on"}
-        )
-        self.assertEqual(response.status_code, 204)
-        self.assertTrue(
-            TransactionEntity.objects.filter(
-                name="Online Store", owner=self.user
-            ).exists()
-        )
-
-    def test_entity_edit_view(self):
-        entity = TransactionEntity.objects.create(name="Local Shop", owner=self.user)
-        response = self.client.post(
-            reverse("entity_edit", args=[entity.id]),
-            {"name": "Local Shop Inc.", "active": "on"},
-        )
-        self.assertEqual(response.status_code, 204)
-        entity.refresh_from_db()
-        self.assertEqual(entity.name, "Local Shop Inc.")
-
-    def test_entity_delete_view(self):
-        entity = TransactionEntity.objects.create(
-            name="To Be Removed Entity", owner=self.user
-        )
-        response = self.client.delete(reverse("entity_delete", args=[entity.id]))
-        self.assertEqual(response.status_code, 204)
-        self.assertFalse(TransactionEntity.all_objects.filter(id=entity.id).exists())
-
-
-class TransactionTests(BaseTransactionAppTest):  # Inherit from BaseTransactionAppTest
-    def setUp(self):
-        super().setUp()  # Call BaseTransactionAppTest's setUp
-        """Set up test data"""
-        # self.category is already created in BaseTransactionAppTest if needed,
-        # or create specific ones here.
-        self.category = TransactionCategory.objects.create(
-            name="Test Category", owner=self.user
-        )
-        self.tag = TransactionTag.objects.create(name="Test Tag", owner=self.user)
-        self.entity = TransactionEntity.objects.create(
-            name="Test Entity", owner=self.user
+            name="Test Account", group=self.account_group, currency=self.currency
         )
+        self.category = TransactionCategory.objects.create(name="Test Category")
 
     def test_transaction_creation(self):
         """Test basic transaction creation with required fields"""
         transaction = Transaction.objects.create(
             account=self.account,
-            owner=self.user,  # Assign owner
             type=Transaction.Type.EXPENSE,
             date=timezone.now().date(),
             amount=Decimal("100.00"),
             description="Test transaction",
-            category=self.category,
         )
-        transaction.tags.add(self.tag)
-        transaction.entities.add(self.entity)
-
         self.assertTrue(transaction.is_paid)
         self.assertEqual(transaction.type, Transaction.Type.EXPENSE)
         self.assertEqual(transaction.account.currency.code, "USD")
-        self.assertEqual(transaction.owner, self.user)
-        self.assertIn(self.tag, transaction.tags.all())
-        self.assertIn(self.entity, transaction.entities.all())
-
-    def test_transaction_creation_view(self):
-        data = {
-            "account": self.account.id,
-            "type": Transaction.Type.INCOME,
-            "is_paid": "on",
-            "date": timezone.now().date().isoformat(),
-            "amount": "250.75",
-            "description": "Freelance Gig",
-            "category": self.category.id,
-            "tags": [
-                self.tag.name
-            ],  # Dynamic fields expect names for creation/selection
-            "entities": [self.entity.name],
-        }
-        response = self.client.post(reverse("transaction_add"), data)
-        self.assertEqual(
-            response.status_code,
-            204,
-            response.content.decode() if response.content else "No content",
-        )
-        self.assertTrue(
-            Transaction.objects.filter(
-                description="Freelance Gig", owner=self.user, amount=Decimal("250.75")
-            ).exists()
-        )
-        # Check that tag and entity were associated (or created if DynamicModel...Field handled it)
-        created_transaction = Transaction.objects.get(description="Freelance Gig")
-        self.assertIn(self.tag, created_transaction.tags.all())
-        self.assertIn(self.entity, created_transaction.entities.all())
-
-    def test_transaction_edit_view(self):
-        transaction = Transaction.objects.create(
-            account=self.account,
-            owner=self.user,
-            type=Transaction.Type.EXPENSE,
-            date=timezone.now().date(),
-            amount=Decimal("50.00"),
-            description="Initial",
-        )
-        updated_description = "Updated Description"
-        updated_amount = "75.25"
-        response = self.client.post(
-            reverse("transaction_edit", args=[transaction.id]),
-            {
-                "account": self.account.id,
-                "type": Transaction.Type.EXPENSE,
-                "is_paid": "on",
-                "date": transaction.date.isoformat(),
-                "amount": updated_amount,
-                "description": updated_description,
-                "category": self.category.id,
-            },
-        )
-        self.assertEqual(response.status_code, 204)
-        transaction.refresh_from_db()
-        self.assertEqual(transaction.description, updated_description)
-        self.assertEqual(transaction.amount, Decimal(updated_amount))
-
-    def test_transaction_soft_delete_view(self):
-        transaction = Transaction.objects.create(
-            account=self.account,
-            owner=self.user,
-            type=Transaction.Type.EXPENSE,
-            date=timezone.now().date(),
-            amount=Decimal("10.00"),
-            description="To Soft Delete",
-        )
-        response = self.client.delete(
-            reverse("transaction_delete", args=[transaction.id])
-        )
-        self.assertEqual(response.status_code, 204)
-        transaction.refresh_from_db()
-        self.assertTrue(transaction.deleted)
-        self.assertIsNotNone(transaction.deleted_at)
-        self.assertTrue(Transaction.deleted_objects.filter(id=transaction.id).exists())
-        self.assertFalse(
-            Transaction.objects.filter(id=transaction.id).exists()
-        )  # Default manager should not find it
-
-    def test_transaction_hard_delete_after_soft_delete(self):
-        # First soft delete
-        transaction = Transaction.objects.create(
-            account=self.account,
-            owner=self.user,
-            type=Transaction.Type.EXPENSE,
-            date=timezone.now().date(),
-            amount=Decimal("15.00"),
-            description="To Hard Delete",
-        )
-        transaction.delete()  # Soft delete via model method
-        self.assertTrue(Transaction.deleted_objects.filter(id=transaction.id).exists())
-
-        # Then hard delete via view (which calls model's delete again on an already soft-deleted item)
-        response = self.client.delete(
-            reverse("transaction_delete", args=[transaction.id])
-        )
-        self.assertEqual(response.status_code, 204)
-        self.assertFalse(Transaction.all_objects.filter(id=transaction.id).exists())
-
-    def test_transaction_undelete_view(self):
-        transaction = Transaction.objects.create(
-            account=self.account,
-            owner=self.user,
-            type=Transaction.Type.EXPENSE,
-            date=timezone.now().date(),
-            amount=Decimal("20.00"),
-            description="To Undelete",
-        )
-        transaction.delete()  # Soft delete
-        transaction.refresh_from_db()
-        self.assertTrue(transaction.deleted)
-
-        response = self.client.get(
-            reverse("transaction_undelete", args=[transaction.id])
-        )
-        self.assertEqual(response.status_code, 204)
-        transaction.refresh_from_db()
-        self.assertFalse(transaction.deleted)
-        self.assertIsNone(transaction.deleted_at)
-        self.assertTrue(Transaction.objects.filter(id=transaction.id).exists())
 
     def test_transaction_with_exchange_currency(self):
         """Test transaction with exchange currency"""
@@ -375,13 +70,11 @@ class TransactionTests(BaseTransactionAppTest):  # Inherit from BaseTransactionA
             from_currency=self.currency,
             to_currency=eur,
             rate=Decimal("0.85"),
-            date=timezone.now().date(),  # Ensure date matches transaction or is general
-            owner=self.user,
+            date=timezone.now(),
         )
 
         transaction = Transaction.objects.create(
             account=self.account,
-            owner=self.user,
             type=Transaction.Type.EXPENSE,
             date=timezone.now().date(),
             amount=Decimal("100.00"),
@@ -391,8 +84,6 @@ class TransactionTests(BaseTransactionAppTest):  # Inherit from BaseTransactionA
         exchanged = transaction.exchanged_amount()
         self.assertIsNotNone(exchanged)
         self.assertEqual(exchanged["prefix"], "€")
-        # Depending on exact conversion logic, you might want to check the amount too
-        # self.assertEqual(exchanged["amount"], Decimal("85.00"))
 
     def test_truncating_amount(self):
         """Test amount truncating based on account.currency decimal places"""
@@ -411,7 +102,6 @@ class TransactionTests(BaseTransactionAppTest):  # Inherit from BaseTransactionA
         """Test reference_date from date"""
         transaction = Transaction.objects.create(
             account=self.account,
-            owner=self.user,
             type=Transaction.Type.EXPENSE,
             date=datetime.datetime(day=20, month=1, year=2000).date(),
             amount=Decimal("100"),
@@ -426,7 +116,6 @@ class TransactionTests(BaseTransactionAppTest):  # Inherit from BaseTransactionA
         """Test reference_date is always on the first day"""
         transaction = Transaction.objects.create(
             account=self.account,
-            owner=self.user,
             type=Transaction.Type.EXPENSE,
             date=datetime.datetime(day=20, month=1, year=2000).date(),
             reference_date=datetime.datetime(day=20, month=2, year=2000).date(),
@@ -438,220 +127,54 @@ class TransactionTests(BaseTransactionAppTest):  # Inherit from BaseTransactionA
             datetime.datetime(day=1, month=2, year=2000).date(),
         )
 
-    def test_transaction_transfer_view(self):
-        other_account = Account.objects.create(
-            name="Other Account",
-            group=self.account_group,
-            currency=self.currency,
-            owner=self.user,
-        )
-        data = {
-            "from_account": self.account.id,
-            "to_account": other_account.id,
-            "from_amount": "100.00",
-            "to_amount": "100.00",  # Assuming same currency for simplicity
-            "date": timezone.now().date().isoformat(),
-            "description": "Test Transfer",
-        }
-        response = self.client.post(reverse("transactions_transfer"), data)
-        self.assertEqual(response.status_code, 204)
-        self.assertTrue(
-            Transaction.objects.filter(
-                account=self.account, type=Transaction.Type.EXPENSE, amount="100.00"
-            ).exists()
-        )
-        self.assertTrue(
-            Transaction.objects.filter(
-                account=other_account, type=Transaction.Type.INCOME, amount="100.00"
-            ).exists()
-        )
 
-    def test_transaction_bulk_edit_view(self):
-        t1 = Transaction.objects.create(
-            account=self.account,
-            owner=self.user,
-            type=Transaction.Type.EXPENSE,
-            date=timezone.now().date(),
-            amount=Decimal("10.00"),
-            description="Bulk 1",
-        )
-        t2 = Transaction.objects.create(
-            account=self.account,
-            owner=self.user,
-            type=Transaction.Type.EXPENSE,
-            date=timezone.now().date(),
-            amount=Decimal("20.00"),
-            description="Bulk 2",
-        )
-        new_category = TransactionCategory.objects.create(
-            name="Bulk Category", owner=self.user
-        )
-        data = {
-            "transactions": [t1.id, t2.id],
-            "category": new_category.id,
-            "is_paid": "true",  # NullBoolean can be 'true', 'false', or empty for no change
-        }
-        response = self.client.post(reverse("transactions_bulk_edit"), data)
-        self.assertEqual(response.status_code, 204)
-        t1.refresh_from_db()
-        t2.refresh_from_db()
-        self.assertEqual(t1.category, new_category)
-        self.assertEqual(t2.category, new_category)
-        self.assertTrue(t1.is_paid)
-        self.assertTrue(t2.is_paid)
-
-
-class InstallmentPlanTests(
-    BaseTransactionAppTest
-):  # Inherit from BaseTransactionAppTest
+class InstallmentPlanTests(TestCase):
     def setUp(self):
-        super().setUp()  # Call BaseTransactionAppTest's setUp
-        # self.currency and self.account are available from base
-        self.category = TransactionCategory.objects.create(
-            name="Installments", owner=self.user
+        """Set up test data"""
+        self.currency = Currency.objects.create(
+            code="USD", name="US Dollar", decimal_places=2, prefix="$ "
+        )
+        self.account = Account.objects.create(
+            name="Test Account", currency=self.currency
         )
 
-    def test_installment_plan_creation_and_transaction_generation(self):
-        """Test basic installment plan creation and its transaction generation."""
-        start_date = timezone.now().date()
+    def test_installment_plan_creation(self):
+        """Test basic installment plan creation"""
         plan = InstallmentPlan.objects.create(
             account=self.account,
             type=Transaction.Type.EXPENSE,
             description="Test Plan",
-            number_of_installments=3,
-            start_date=start_date,
+            number_of_installments=12,
+            start_date=timezone.now().date(),
             installment_amount=Decimal("100.00"),
             recurrence=InstallmentPlan.Recurrence.MONTHLY,
-            category=self.category,
-        )
-        plan.create_transactions()  # Manually call as it's not in save in the form
-
-        self.assertEqual(plan.transactions.count(), 3)
-        first_transaction = plan.transactions.order_by("date").first()
-        self.assertEqual(first_transaction.amount, Decimal("100.00"))
-        self.assertEqual(first_transaction.date, start_date)
-        self.assertEqual(first_transaction.category, self.category)
-
-    def test_installment_plan_update_transactions(self):
-        start_date = timezone.now().date()
-        plan = InstallmentPlan.objects.create(
-            account=self.account,
-            type=Transaction.Type.EXPENSE,
-            description="Initial Plan",
-            number_of_installments=2,
-            start_date=start_date,
-            installment_amount=Decimal("50.00"),
-            recurrence=InstallmentPlan.Recurrence.MONTHLY,
-        )
-        plan.create_transactions()
-        self.assertEqual(plan.transactions.count(), 2)
-
-        plan.description = "Updated Plan Description"
-        plan.installment_amount = Decimal("60.00")
-        plan.number_of_installments = 3  # Increase installments
-        plan.save()  # This should trigger _calculate_end_date and _calculate_installment_total_number
-        plan.update_transactions()  # Manually call as it's not in save in the form
-
-        self.assertEqual(plan.transactions.count(), 3)
-        updated_transaction = plan.transactions.order_by("date").first()
-        self.assertEqual(updated_transaction.description, "Updated Plan Description")
-        # Amount should not change if already paid, but these are created as unpaid
-        self.assertEqual(updated_transaction.amount, Decimal("60.00"))
-
-    def test_installment_plan_delete_with_transactions(self):
-        plan = InstallmentPlan.objects.create(
-            account=self.account,
-            type=Transaction.Type.EXPENSE,
-            description="Plan to Delete",
-            number_of_installments=2,
-            start_date=timezone.now().date(),
-            installment_amount=Decimal("25.00"),
-            recurrence=InstallmentPlan.Recurrence.MONTHLY,
-        )
-        plan.create_transactions()
-        plan_id = plan.id
-        self.assertTrue(
-            Transaction.objects.filter(installment_plan_id=plan_id).exists()
-        )
-
-        plan.delete()  # This should also delete related transactions as per model's delete
-        self.assertFalse(InstallmentPlan.all_objects.filter(id=plan_id).exists())
-        self.assertFalse(
-            Transaction.all_objects.filter(installment_plan_id=plan_id).exists()
         )
+        self.assertEqual(plan.number_of_installments, 12)
+        self.assertEqual(plan.installment_start, 1)
+        self.assertEqual(plan.account.currency.code, "USD")
 
 
-class RecurringTransactionTests(BaseTransactionAppTest):  # Inherit
+class RecurringTransactionTests(TestCase):
     def setUp(self):
-        super().setUp()
-        self.category = TransactionCategory.objects.create(
-            name="Recurring Category", owner=self.user
+        """Set up test data"""
+        self.currency = Currency.objects.create(
+            code="USD", name="US Dollar", decimal_places=2, prefix="$ "
+        )
+        self.account = Account.objects.create(
+            name="Test Account", currency=self.currency
         )
 
-    def test_recurring_transaction_creation_and_upcoming_generation(self):
-        """Test basic recurring transaction creation and initial upcoming transaction generation."""
-        start_date = timezone.now().date()
-        recurring = RecurringTransaction.objects.create(
-            account=self.account,
-            type=Transaction.Type.INCOME,
-            amount=Decimal("200.00"),
-            description="Monthly Salary",
-            start_date=start_date,
-            recurrence_type=RecurringTransaction.RecurrenceType.MONTH,
-            recurrence_interval=1,
-            category=self.category,
-        )
-        recurring.create_upcoming_transactions()  # Manually call
-
-        # It should create a few transactions (e.g., for next 5 occurrences or up to end_date)
-        self.assertTrue(recurring.transactions.count() > 0)
-        first_upcoming = recurring.transactions.order_by("date").first()
-        self.assertEqual(first_upcoming.amount, Decimal("200.00"))
-        self.assertEqual(
-            first_upcoming.date, start_date
-        )  # First one should be on start_date
-        self.assertFalse(first_upcoming.is_paid)
-
-    def test_recurring_transaction_update_unpaid(self):
+    def test_recurring_transaction_creation(self):
+        """Test basic recurring transaction creation"""
         recurring = RecurringTransaction.objects.create(
             account=self.account,
             type=Transaction.Type.EXPENSE,
-            amount=Decimal("30.00"),
-            description="Subscription",
+            amount=Decimal("100.00"),
+            description="Monthly Payment",
             start_date=timezone.now().date(),
             recurrence_type=RecurringTransaction.RecurrenceType.MONTH,
             recurrence_interval=1,
         )
-        recurring.create_upcoming_transactions()
-        unpaid_transaction = recurring.transactions.filter(is_paid=False).first()
-        self.assertIsNotNone(unpaid_transaction)
-
-        recurring.amount = Decimal("35.00")
-        recurring.description = "Updated Subscription"
-        recurring.save()
-        recurring.update_unpaid_transactions()  # Manually call
-
-        unpaid_transaction.refresh_from_db()
-        self.assertEqual(unpaid_transaction.amount, Decimal("35.00"))
-        self.assertEqual(unpaid_transaction.description, "Updated Subscription")
-
-    def test_recurring_transaction_delete_unpaid(self):
-        recurring = RecurringTransaction.objects.create(
-            account=self.account,
-            type=Transaction.Type.EXPENSE,
-            amount=Decimal("40.00"),
-            description="Service Fee",
-            start_date=timezone.now().date() + timedelta(days=5),  # future start
-            recurrence_type=RecurringTransaction.RecurrenceType.MONTH,
-            recurrence_interval=1,
-        )
-        recurring.create_upcoming_transactions()
-        self.assertTrue(recurring.transactions.filter(is_paid=False).exists())
-
-        recurring.delete_unpaid_transactions()  # Manually call
-        # This method in the model deletes transactions with date > today
-        self.assertFalse(
-            recurring.transactions.filter(
-                is_paid=False, date__gt=timezone.now().date()
-            ).exists()
-        )
+        self.assertFalse(recurring.paused)
+        self.assertEqual(recurring.recurrence_interval, 1)
+        self.assertEqual(recurring.account.currency.code, "USD")

app/apps/transactions/urls.py

@@ -307,4 +307,39 @@ urlpatterns = [
         views.recurring_transaction_finish,
         name="recurring_transaction_finish",
     ),
+    path(
+        "quick-transactions/",
+        views.quick_transactions_index,
+        name="quick_transactions_index",
+    ),
+    path(
+        "quick-transactions/list/",
+        views.quick_transactions_list,
+        name="quick_transactions_list",
+    ),
+    path(
+        "quick-transactions/add/",
+        views.quick_transaction_add,
+        name="quick_transaction_add",
+    ),
+    path(
+        "quick-transactions/<int:quick_transaction_id>/edit/",
+        views.quick_transaction_edit,
+        name="quick_transaction_edit",
+    ),
+    path(
+        "quick-transactions/<int:quick_transaction_id>/delete/",
+        views.quick_transaction_delete,
+        name="quick_transaction_delete",
+    ),
+    path(
+        "quick-transactions/create-menu/",
+        views.quick_transactions_create_menu,
+        name="quick_transactions_create_menu",
+    ),
+    path(
+        "quick-transactions/<int:quick_transaction_id>/create/",
+        views.quick_transaction_add_as_transaction,
+        name="quick_transaction_add_as_transaction",
+    ),
 ]

app/apps/transactions/views/__init__.py

@@ -5,3 +5,4 @@ from .categories import *
 from .actions import *
 from .installment_plans import *
 from .recurring_transactions import *
+from .quick_transactions import *

app/apps/transactions/views/quick_transactions.py

@@ -0,0 +1,154 @@
+from django.contrib import messages
+from django.contrib.auth.decorators import login_required
+from django.forms import model_to_dict
+from django.http import HttpResponse
+from django.shortcuts import render, get_object_or_404
+from django.utils import timezone
+from django.utils.translation import gettext_lazy as _
+from django.views.decorators.http import require_http_methods
+
+from apps.common.decorators.htmx import only_htmx
+from apps.transactions.forms import QuickTransactionForm
+from apps.transactions.models import QuickTransaction, transaction_created
+from apps.transactions.models import Transaction
+
+
+@login_required
+@require_http_methods(["GET"])
+def quick_transactions_index(request):
+    return render(
+        request,
+        "quick_transactions/pages/index.html",
+    )
+
+
+@only_htmx
+@login_required
+@require_http_methods(["GET"])
+def quick_transactions_list(request):
+    quick_transactions = QuickTransaction.objects.all().order_by("name")
+    return render(
+        request,
+        "quick_transactions/fragments/list.html",
+        context={"quick_transactions": quick_transactions},
+    )
+
+
+@only_htmx
+@login_required
+@require_http_methods(["GET", "POST"])
+def quick_transaction_add(request):
+    if request.method == "POST":
+        form = QuickTransactionForm(request.POST)
+        if form.is_valid():
+            form.save()
+            messages.success(request, _("Item added successfully"))
+
+            return HttpResponse(
+                status=204,
+                headers={
+                    "HX-Trigger": "updated, hide_offcanvas",
+                },
+            )
+    else:
+        form = QuickTransactionForm()
+
+    return render(
+        request,
+        "quick_transactions/fragments/add.html",
+        {"form": form},
+    )
+
+
+@only_htmx
+@login_required
+@require_http_methods(["GET", "POST"])
+def quick_transaction_edit(request, quick_transaction_id):
+    quick_transaction = get_object_or_404(QuickTransaction, id=quick_transaction_id)
+
+    if request.method == "POST":
+        form = QuickTransactionForm(request.POST, instance=quick_transaction)
+        if form.is_valid():
+            form.save()
+            messages.success(request, _("Item updated successfully"))
+
+            return HttpResponse(
+                status=204,
+                headers={
+                    "HX-Trigger": "updated, hide_offcanvas",
+                },
+            )
+    else:
+        form = QuickTransactionForm(instance=quick_transaction)
+
+    return render(
+        request,
+        "quick_transactions/fragments/edit.html",
+        {"form": form, "quick_transaction": quick_transaction},
+    )
+
+
+@only_htmx
+@login_required
+@require_http_methods(["DELETE"])
+def quick_transaction_delete(request, quick_transaction_id):
+    quick_transaction = get_object_or_404(QuickTransaction, id=quick_transaction_id)
+
+    quick_transaction.delete()
+
+    messages.success(request, _("Item deleted successfully"))
+
+    return HttpResponse(
+        status=204,
+        headers={
+            "HX-Trigger": "updated, hide_offcanvas",
+        },
+    )
+
+
+@only_htmx
+@login_required
+@require_http_methods(["GET"])
+def quick_transactions_create_menu(request):
+    quick_transactions = QuickTransaction.objects.all().order_by("name")
+    return render(
+        request,
+        "quick_transactions/fragments/create_menu.html",
+        context={"quick_transactions": quick_transactions},
+    )
+
+
+@only_htmx
+@login_required
+@require_http_methods(["GET"])
+def quick_transaction_add_as_transaction(request, quick_transaction_id):
+    quick_transaction: QuickTransaction = get_object_or_404(
+        QuickTransaction, id=quick_transaction_id
+    )
+    today = timezone.localdate(timezone.now())
+
+    quick_transaction_data = model_to_dict(
+        quick_transaction,
+        exclude=["id", "name", "owner", "account", "category", "tags", "entities"],
+    )
+
+    new_transaction = Transaction(**quick_transaction_data)
+    new_transaction.account = quick_transaction.account
+    new_transaction.category = quick_transaction.category
+
+    new_transaction.date = today
+    new_transaction.reference_date = today.replace(day=1)
+    new_transaction.save()
+    new_transaction.tags.set(quick_transaction.tags.all())
+    new_transaction.entities.set(quick_transaction.entities.all())
+
+    transaction_created.send(sender=new_transaction)
+
+    messages.success(request, _("Transaction added successfully"))
+
+    return HttpResponse(
+        status=204,
+        headers={
+            "HX-Trigger": "updated, hide_offcanvas",
+        },
+    )

app/apps/users/forms.py

@@ -2,7 +2,7 @@ from crispy_forms.bootstrap import (
     FormActions,
 )
 from crispy_forms.helper import FormHelper
-from crispy_forms.layout import Layout, Submit, Row, Column, Field, Div
+from crispy_forms.layout import Layout, Submit, Row, Column, Field, Div, HTML
 from django import forms
 from django.contrib.auth import get_user_model
 from django.contrib.auth.forms import (
@@ -115,6 +115,7 @@ class UserSettingsForm(forms.ModelForm):
             "date_format",
             "datetime_format",
             "number_format",
+            "volume",
         ]
 
     def __init__(self, *args, **kwargs):
@@ -126,10 +127,14 @@ class UserSettingsForm(forms.ModelForm):
         self.helper.layout = Layout(
             "language",
             "timezone",
+            HTML("<hr />"),
             "date_format",
             "datetime_format",
             "number_format",
+            HTML("<hr />"),
             "start_page",
+            HTML("<hr />"),
+            "volume",
             FormActions(
                 NoClassSubmit(
                     "submit", _("Save"), css_class="btn btn-outline-primary w-100"

app/apps/users/migrations/0022_usersettings_volume_alter_usersettings_timezone.py

@@ -0,0 +1,479 @@
+# Generated by Django 5.1.1 on 2025-06-29 00:48
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("users", "0021_alter_usersettings_timezone"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="usersettings",
+            name="volume",
+            field=models.PositiveIntegerField(
+                default=10,
+                validators=[
+                    django.core.validators.MinValueValidator(1),
+                    django.core.validators.MaxValueValidator(10),
+                ],
+                verbose_name="Volume",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="usersettings",
+            name="timezone",
+            field=models.CharField(
+                choices=[
+                    ("auto", "Auto"),
+                    ("Africa/Abidjan", "Africa/Abidjan"),
+                    ("Africa/Accra", "Africa/Accra"),
+                    ("Africa/Addis_Ababa", "Africa/Addis_Ababa"),
+                    ("Africa/Algiers", "Africa/Algiers"),
+                    ("Africa/Asmara", "Africa/Asmara"),
+                    ("Africa/Bamako", "Africa/Bamako"),
+                    ("Africa/Bangui", "Africa/Bangui"),
+                    ("Africa/Banjul", "Africa/Banjul"),
+                    ("Africa/Bissau", "Africa/Bissau"),
+                    ("Africa/Blantyre", "Africa/Blantyre"),
+                    ("Africa/Brazzaville", "Africa/Brazzaville"),
+                    ("Africa/Bujumbura", "Africa/Bujumbura"),
+                    ("Africa/Cairo", "Africa/Cairo"),
+                    ("Africa/Casablanca", "Africa/Casablanca"),
+                    ("Africa/Ceuta", "Africa/Ceuta"),
+                    ("Africa/Conakry", "Africa/Conakry"),
+                    ("Africa/Dakar", "Africa/Dakar"),
+                    ("Africa/Dar_es_Salaam", "Africa/Dar_es_Salaam"),
+                    ("Africa/Djibouti", "Africa/Djibouti"),
+                    ("Africa/Douala", "Africa/Douala"),
+                    ("Africa/El_Aaiun", "Africa/El_Aaiun"),
+                    ("Africa/Freetown", "Africa/Freetown"),
+                    ("Africa/Gaborone", "Africa/Gaborone"),
+                    ("Africa/Harare", "Africa/Harare"),
+                    ("Africa/Johannesburg", "Africa/Johannesburg"),
+                    ("Africa/Juba", "Africa/Juba"),
+                    ("Africa/Kampala", "Africa/Kampala"),
+                    ("Africa/Khartoum", "Africa/Khartoum"),
+                    ("Africa/Kigali", "Africa/Kigali"),
+                    ("Africa/Kinshasa", "Africa/Kinshasa"),
+                    ("Africa/Lagos", "Africa/Lagos"),
+                    ("Africa/Libreville", "Africa/Libreville"),
+                    ("Africa/Lome", "Africa/Lome"),
+                    ("Africa/Luanda", "Africa/Luanda"),
+                    ("Africa/Lubumbashi", "Africa/Lubumbashi"),
+                    ("Africa/Lusaka", "Africa/Lusaka"),
+                    ("Africa/Malabo", "Africa/Malabo"),
+                    ("Africa/Maputo", "Africa/Maputo"),
+                    ("Africa/Maseru", "Africa/Maseru"),
+                    ("Africa/Mbabane", "Africa/Mbabane"),
+                    ("Africa/Mogadishu", "Africa/Mogadishu"),
+                    ("Africa/Monrovia", "Africa/Monrovia"),
+                    ("Africa/Nairobi", "Africa/Nairobi"),
+                    ("Africa/Ndjamena", "Africa/Ndjamena"),
+                    ("Africa/Niamey", "Africa/Niamey"),
+                    ("Africa/Nouakchott", "Africa/Nouakchott"),
+                    ("Africa/Ouagadougou", "Africa/Ouagadougou"),
+                    ("Africa/Porto-Novo", "Africa/Porto-Novo"),
+                    ("Africa/Sao_Tome", "Africa/Sao_Tome"),
+                    ("Africa/Tripoli", "Africa/Tripoli"),
+                    ("Africa/Tunis", "Africa/Tunis"),
+                    ("Africa/Windhoek", "Africa/Windhoek"),
+                    ("America/Adak", "America/Adak"),
+                    ("America/Anchorage", "America/Anchorage"),
+                    ("America/Anguilla", "America/Anguilla"),
+                    ("America/Antigua", "America/Antigua"),
+                    ("America/Araguaina", "America/Araguaina"),
+                    (
+                        "America/Argentina/Buenos_Aires",
+                        "America/Argentina/Buenos_Aires",
+                    ),
+                    ("America/Argentina/Catamarca", "America/Argentina/Catamarca"),
+                    ("America/Argentina/Cordoba", "America/Argentina/Cordoba"),
+                    ("America/Argentina/Jujuy", "America/Argentina/Jujuy"),
+                    ("America/Argentina/La_Rioja", "America/Argentina/La_Rioja"),
+                    ("America/Argentina/Mendoza", "America/Argentina/Mendoza"),
+                    (
+                        "America/Argentina/Rio_Gallegos",
+                        "America/Argentina/Rio_Gallegos",
+                    ),
+                    ("America/Argentina/Salta", "America/Argentina/Salta"),
+                    ("America/Argentina/San_Juan", "America/Argentina/San_Juan"),
+                    ("America/Argentina/San_Luis", "America/Argentina/San_Luis"),
+                    ("America/Argentina/Tucuman", "America/Argentina/Tucuman"),
+                    ("America/Argentina/Ushuaia", "America/Argentina/Ushuaia"),
+                    ("America/Aruba", "America/Aruba"),
+                    ("America/Asuncion", "America/Asuncion"),
+                    ("America/Atikokan", "America/Atikokan"),
+                    ("America/Bahia", "America/Bahia"),
+                    ("America/Bahia_Banderas", "America/Bahia_Banderas"),
+                    ("America/Barbados", "America/Barbados"),
+                    ("America/Belem", "America/Belem"),
+                    ("America/Belize", "America/Belize"),
+                    ("America/Blanc-Sablon", "America/Blanc-Sablon"),
+                    ("America/Boa_Vista", "America/Boa_Vista"),
+                    ("America/Bogota", "America/Bogota"),
+                    ("America/Boise", "America/Boise"),
+                    ("America/Cambridge_Bay", "America/Cambridge_Bay"),
+                    ("America/Campo_Grande", "America/Campo_Grande"),
+                    ("America/Cancun", "America/Cancun"),
+                    ("America/Caracas", "America/Caracas"),
+                    ("America/Cayenne", "America/Cayenne"),
+                    ("America/Cayman", "America/Cayman"),
+                    ("America/Chicago", "America/Chicago"),
+                    ("America/Chihuahua", "America/Chihuahua"),
+                    ("America/Ciudad_Juarez", "America/Ciudad_Juarez"),
+                    ("America/Costa_Rica", "America/Costa_Rica"),
+                    ("America/Creston", "America/Creston"),
+                    ("America/Cuiaba", "America/Cuiaba"),
+                    ("America/Curacao", "America/Curacao"),
+                    ("America/Danmarkshavn", "America/Danmarkshavn"),
+                    ("America/Dawson", "America/Dawson"),
+                    ("America/Dawson_Creek", "America/Dawson_Creek"),
+                    ("America/Denver", "America/Denver"),
+                    ("America/Detroit", "America/Detroit"),
+                    ("America/Dominica", "America/Dominica"),
+                    ("America/Edmonton", "America/Edmonton"),
+                    ("America/Eirunepe", "America/Eirunepe"),
+                    ("America/El_Salvador", "America/El_Salvador"),
+                    ("America/Fort_Nelson", "America/Fort_Nelson"),
+                    ("America/Fortaleza", "America/Fortaleza"),
+                    ("America/Glace_Bay", "America/Glace_Bay"),
+                    ("America/Goose_Bay", "America/Goose_Bay"),
+                    ("America/Grand_Turk", "America/Grand_Turk"),
+                    ("America/Grenada", "America/Grenada"),
+                    ("America/Guadeloupe", "America/Guadeloupe"),
+                    ("America/Guatemala", "America/Guatemala"),
+                    ("America/Guayaquil", "America/Guayaquil"),
+                    ("America/Guyana", "America/Guyana"),
+                    ("America/Halifax", "America/Halifax"),
+                    ("America/Havana", "America/Havana"),
+                    ("America/Hermosillo", "America/Hermosillo"),
+                    ("America/Indiana/Indianapolis", "America/Indiana/Indianapolis"),
+                    ("America/Indiana/Knox", "America/Indiana/Knox"),
+                    ("America/Indiana/Marengo", "America/Indiana/Marengo"),
+                    ("America/Indiana/Petersburg", "America/Indiana/Petersburg"),
+                    ("America/Indiana/Tell_City", "America/Indiana/Tell_City"),
+                    ("America/Indiana/Vevay", "America/Indiana/Vevay"),
+                    ("America/Indiana/Vincennes", "America/Indiana/Vincennes"),
+                    ("America/Indiana/Winamac", "America/Indiana/Winamac"),
+                    ("America/Inuvik", "America/Inuvik"),
+                    ("America/Iqaluit", "America/Iqaluit"),
+                    ("America/Jamaica", "America/Jamaica"),
+                    ("America/Juneau", "America/Juneau"),
+                    ("America/Kentucky/Louisville", "America/Kentucky/Louisville"),
+                    ("America/Kentucky/Monticello", "America/Kentucky/Monticello"),
+                    ("America/Kralendijk", "America/Kralendijk"),
+                    ("America/La_Paz", "America/La_Paz"),
+                    ("America/Lima", "America/Lima"),
+                    ("America/Los_Angeles", "America/Los_Angeles"),
+                    ("America/Lower_Princes", "America/Lower_Princes"),
+                    ("America/Maceio", "America/Maceio"),
+                    ("America/Managua", "America/Managua"),
+                    ("America/Manaus", "America/Manaus"),
+                    ("America/Marigot", "America/Marigot"),
+                    ("America/Martinique", "America/Martinique"),
+                    ("America/Matamoros", "America/Matamoros"),
+                    ("America/Mazatlan", "America/Mazatlan"),
+                    ("America/Menominee", "America/Menominee"),
+                    ("America/Merida", "America/Merida"),
+                    ("America/Metlakatla", "America/Metlakatla"),
+                    ("America/Mexico_City", "America/Mexico_City"),
+                    ("America/Miquelon", "America/Miquelon"),
+                    ("America/Moncton", "America/Moncton"),
+                    ("America/Monterrey", "America/Monterrey"),
+                    ("America/Montevideo", "America/Montevideo"),
+                    ("America/Montserrat", "America/Montserrat"),
+                    ("America/Nassau", "America/Nassau"),
+                    ("America/New_York", "America/New_York"),
+                    ("America/Nome", "America/Nome"),
+                    ("America/Noronha", "America/Noronha"),
+                    ("America/North_Dakota/Beulah", "America/North_Dakota/Beulah"),
+                    ("America/North_Dakota/Center", "America/North_Dakota/Center"),
+                    (
+                        "America/North_Dakota/New_Salem",
+                        "America/North_Dakota/New_Salem",
+                    ),
+                    ("America/Nuuk", "America/Nuuk"),
+                    ("America/Ojinaga", "America/Ojinaga"),
+                    ("America/Panama", "America/Panama"),
+                    ("America/Paramaribo", "America/Paramaribo"),
+                    ("America/Phoenix", "America/Phoenix"),
+                    ("America/Port-au-Prince", "America/Port-au-Prince"),
+                    ("America/Port_of_Spain", "America/Port_of_Spain"),
+                    ("America/Porto_Velho", "America/Porto_Velho"),
+                    ("America/Puerto_Rico", "America/Puerto_Rico"),
+                    ("America/Punta_Arenas", "America/Punta_Arenas"),
+                    ("America/Rankin_Inlet", "America/Rankin_Inlet"),
+                    ("America/Recife", "America/Recife"),
+                    ("America/Regina", "America/Regina"),
+                    ("America/Resolute", "America/Resolute"),
+                    ("America/Rio_Branco", "America/Rio_Branco"),
+                    ("America/Santarem", "America/Santarem"),
+                    ("America/Santiago", "America/Santiago"),
+                    ("America/Santo_Domingo", "America/Santo_Domingo"),
+                    ("America/Sao_Paulo", "America/Sao_Paulo"),
+                    ("America/Scoresbysund", "America/Scoresbysund"),
+                    ("America/Sitka", "America/Sitka"),
+                    ("America/St_Barthelemy", "America/St_Barthelemy"),
+                    ("America/St_Johns", "America/St_Johns"),
+                    ("America/St_Kitts", "America/St_Kitts"),
+                    ("America/St_Lucia", "America/St_Lucia"),
+                    ("America/St_Thomas", "America/St_Thomas"),
+                    ("America/St_Vincent", "America/St_Vincent"),
+                    ("America/Swift_Current", "America/Swift_Current"),
+                    ("America/Tegucigalpa", "America/Tegucigalpa"),
+                    ("America/Thule", "America/Thule"),
+                    ("America/Tijuana", "America/Tijuana"),
+                    ("America/Toronto", "America/Toronto"),
+                    ("America/Tortola", "America/Tortola"),
+                    ("America/Vancouver", "America/Vancouver"),
+                    ("America/Whitehorse", "America/Whitehorse"),
+                    ("America/Winnipeg", "America/Winnipeg"),
+                    ("America/Yakutat", "America/Yakutat"),
+                    ("Antarctica/Casey", "Antarctica/Casey"),
+                    ("Antarctica/Davis", "Antarctica/Davis"),
+                    ("Antarctica/DumontDUrville", "Antarctica/DumontDUrville"),
+                    ("Antarctica/Macquarie", "Antarctica/Macquarie"),
+                    ("Antarctica/Mawson", "Antarctica/Mawson"),
+                    ("Antarctica/McMurdo", "Antarctica/McMurdo"),
+                    ("Antarctica/Palmer", "Antarctica/Palmer"),
+                    ("Antarctica/Rothera", "Antarctica/Rothera"),
+                    ("Antarctica/Syowa", "Antarctica/Syowa"),
+                    ("Antarctica/Troll", "Antarctica/Troll"),
+                    ("Antarctica/Vostok", "Antarctica/Vostok"),
+                    ("Arctic/Longyearbyen", "Arctic/Longyearbyen"),
+                    ("Asia/Aden", "Asia/Aden"),
+                    ("Asia/Almaty", "Asia/Almaty"),
+                    ("Asia/Amman", "Asia/Amman"),
+                    ("Asia/Anadyr", "Asia/Anadyr"),
+                    ("Asia/Aqtau", "Asia/Aqtau"),
+                    ("Asia/Aqtobe", "Asia/Aqtobe"),
+                    ("Asia/Ashgabat", "Asia/Ashgabat"),
+                    ("Asia/Atyrau", "Asia/Atyrau"),
+                    ("Asia/Baghdad", "Asia/Baghdad"),
+                    ("Asia/Bahrain", "Asia/Bahrain"),
+                    ("Asia/Baku", "Asia/Baku"),
+                    ("Asia/Bangkok", "Asia/Bangkok"),
+                    ("Asia/Barnaul", "Asia/Barnaul"),
+                    ("Asia/Beirut", "Asia/Beirut"),
+                    ("Asia/Bishkek", "Asia/Bishkek"),
+                    ("Asia/Brunei", "Asia/Brunei"),
+                    ("Asia/Chita", "Asia/Chita"),
+                    ("Asia/Colombo", "Asia/Colombo"),
+                    ("Asia/Damascus", "Asia/Damascus"),
+                    ("Asia/Dhaka", "Asia/Dhaka"),
+                    ("Asia/Dili", "Asia/Dili"),
+                    ("Asia/Dubai", "Asia/Dubai"),
+                    ("Asia/Dushanbe", "Asia/Dushanbe"),
+                    ("Asia/Famagusta", "Asia/Famagusta"),
+                    ("Asia/Gaza", "Asia/Gaza"),
+                    ("Asia/Hebron", "Asia/Hebron"),
+                    ("Asia/Ho_Chi_Minh", "Asia/Ho_Chi_Minh"),
+                    ("Asia/Hong_Kong", "Asia/Hong_Kong"),
+                    ("Asia/Hovd", "Asia/Hovd"),
+                    ("Asia/Irkutsk", "Asia/Irkutsk"),
+                    ("Asia/Jakarta", "Asia/Jakarta"),
+                    ("Asia/Jayapura", "Asia/Jayapura"),
+                    ("Asia/Jerusalem", "Asia/Jerusalem"),
+                    ("Asia/Kabul", "Asia/Kabul"),
+                    ("Asia/Kamchatka", "Asia/Kamchatka"),
+                    ("Asia/Karachi", "Asia/Karachi"),
+                    ("Asia/Kathmandu", "Asia/Kathmandu"),
+                    ("Asia/Khandyga", "Asia/Khandyga"),
+                    ("Asia/Kolkata", "Asia/Kolkata"),
+                    ("Asia/Krasnoyarsk", "Asia/Krasnoyarsk"),
+                    ("Asia/Kuala_Lumpur", "Asia/Kuala_Lumpur"),
+                    ("Asia/Kuching", "Asia/Kuching"),
+                    ("Asia/Kuwait", "Asia/Kuwait"),
+                    ("Asia/Macau", "Asia/Macau"),
+                    ("Asia/Magadan", "Asia/Magadan"),
+                    ("Asia/Makassar", "Asia/Makassar"),
+                    ("Asia/Manila", "Asia/Manila"),
+                    ("Asia/Muscat", "Asia/Muscat"),
+                    ("Asia/Nicosia", "Asia/Nicosia"),
+                    ("Asia/Novokuznetsk", "Asia/Novokuznetsk"),
+                    ("Asia/Novosibirsk", "Asia/Novosibirsk"),
+                    ("Asia/Omsk", "Asia/Omsk"),
+                    ("Asia/Oral", "Asia/Oral"),
+                    ("Asia/Phnom_Penh", "Asia/Phnom_Penh"),
+                    ("Asia/Pontianak", "Asia/Pontianak"),
+                    ("Asia/Pyongyang", "Asia/Pyongyang"),
+                    ("Asia/Qatar", "Asia/Qatar"),
+                    ("Asia/Qostanay", "Asia/Qostanay"),
+                    ("Asia/Qyzylorda", "Asia/Qyzylorda"),
+                    ("Asia/Riyadh", "Asia/Riyadh"),
+                    ("Asia/Sakhalin", "Asia/Sakhalin"),
+                    ("Asia/Samarkand", "Asia/Samarkand"),
+                    ("Asia/Seoul", "Asia/Seoul"),
+                    ("Asia/Shanghai", "Asia/Shanghai"),
+                    ("Asia/Singapore", "Asia/Singapore"),
+                    ("Asia/Srednekolymsk", "Asia/Srednekolymsk"),
+                    ("Asia/Taipei", "Asia/Taipei"),
+                    ("Asia/Tashkent", "Asia/Tashkent"),
+                    ("Asia/Tbilisi", "Asia/Tbilisi"),
+                    ("Asia/Tehran", "Asia/Tehran"),
+                    ("Asia/Thimphu", "Asia/Thimphu"),
+                    ("Asia/Tokyo", "Asia/Tokyo"),
+                    ("Asia/Tomsk", "Asia/Tomsk"),
+                    ("Asia/Ulaanbaatar", "Asia/Ulaanbaatar"),
+                    ("Asia/Urumqi", "Asia/Urumqi"),
+                    ("Asia/Ust-Nera", "Asia/Ust-Nera"),
+                    ("Asia/Vientiane", "Asia/Vientiane"),
+                    ("Asia/Vladivostok", "Asia/Vladivostok"),
+                    ("Asia/Yakutsk", "Asia/Yakutsk"),
+                    ("Asia/Yangon", "Asia/Yangon"),
+                    ("Asia/Yekaterinburg", "Asia/Yekaterinburg"),
+                    ("Asia/Yerevan", "Asia/Yerevan"),
+                    ("Atlantic/Azores", "Atlantic/Azores"),
+                    ("Atlantic/Bermuda", "Atlantic/Bermuda"),
+                    ("Atlantic/Canary", "Atlantic/Canary"),
+                    ("Atlantic/Cape_Verde", "Atlantic/Cape_Verde"),
+                    ("Atlantic/Faroe", "Atlantic/Faroe"),
+                    ("Atlantic/Madeira", "Atlantic/Madeira"),
+                    ("Atlantic/Reykjavik", "Atlantic/Reykjavik"),
+                    ("Atlantic/South_Georgia", "Atlantic/South_Georgia"),
+                    ("Atlantic/St_Helena", "Atlantic/St_Helena"),
+                    ("Atlantic/Stanley", "Atlantic/Stanley"),
+                    ("Australia/Adelaide", "Australia/Adelaide"),
+                    ("Australia/Brisbane", "Australia/Brisbane"),
+                    ("Australia/Broken_Hill", "Australia/Broken_Hill"),
+                    ("Australia/Darwin", "Australia/Darwin"),
+                    ("Australia/Eucla", "Australia/Eucla"),
+                    ("Australia/Hobart", "Australia/Hobart"),
+                    ("Australia/Lindeman", "Australia/Lindeman"),
+                    ("Australia/Lord_Howe", "Australia/Lord_Howe"),
+                    ("Australia/Melbourne", "Australia/Melbourne"),
+                    ("Australia/Perth", "Australia/Perth"),
+                    ("Australia/Sydney", "Australia/Sydney"),
+                    ("Canada/Atlantic", "Canada/Atlantic"),
+                    ("Canada/Central", "Canada/Central"),
+                    ("Canada/Eastern", "Canada/Eastern"),
+                    ("Canada/Mountain", "Canada/Mountain"),
+                    ("Canada/Newfoundland", "Canada/Newfoundland"),
+                    ("Canada/Pacific", "Canada/Pacific"),
+                    ("Europe/Amsterdam", "Europe/Amsterdam"),
+                    ("Europe/Andorra", "Europe/Andorra"),
+                    ("Europe/Astrakhan", "Europe/Astrakhan"),
+                    ("Europe/Athens", "Europe/Athens"),
+                    ("Europe/Belgrade", "Europe/Belgrade"),
+                    ("Europe/Berlin", "Europe/Berlin"),
+                    ("Europe/Bratislava", "Europe/Bratislava"),
+                    ("Europe/Brussels", "Europe/Brussels"),
+                    ("Europe/Bucharest", "Europe/Bucharest"),
+                    ("Europe/Budapest", "Europe/Budapest"),
+                    ("Europe/Busingen", "Europe/Busingen"),
+                    ("Europe/Chisinau", "Europe/Chisinau"),
+                    ("Europe/Copenhagen", "Europe/Copenhagen"),
+                    ("Europe/Dublin", "Europe/Dublin"),
+                    ("Europe/Gibraltar", "Europe/Gibraltar"),
+                    ("Europe/Guernsey", "Europe/Guernsey"),
+                    ("Europe/Helsinki", "Europe/Helsinki"),
+                    ("Europe/Isle_of_Man", "Europe/Isle_of_Man"),
+                    ("Europe/Istanbul", "Europe/Istanbul"),
+                    ("Europe/Jersey", "Europe/Jersey"),
+                    ("Europe/Kaliningrad", "Europe/Kaliningrad"),
+                    ("Europe/Kirov", "Europe/Kirov"),
+                    ("Europe/Kyiv", "Europe/Kyiv"),
+                    ("Europe/Lisbon", "Europe/Lisbon"),
+                    ("Europe/Ljubljana", "Europe/Ljubljana"),
+                    ("Europe/London", "Europe/London"),
+                    ("Europe/Luxembourg", "Europe/Luxembourg"),
+                    ("Europe/Madrid", "Europe/Madrid"),
+                    ("Europe/Malta", "Europe/Malta"),
+                    ("Europe/Mariehamn", "Europe/Mariehamn"),
+                    ("Europe/Minsk", "Europe/Minsk"),
+                    ("Europe/Monaco", "Europe/Monaco"),
+                    ("Europe/Moscow", "Europe/Moscow"),
+                    ("Europe/Oslo", "Europe/Oslo"),
+                    ("Europe/Paris", "Europe/Paris"),
+                    ("Europe/Podgorica", "Europe/Podgorica"),
+                    ("Europe/Prague", "Europe/Prague"),
+                    ("Europe/Riga", "Europe/Riga"),
+                    ("Europe/Rome", "Europe/Rome"),
+                    ("Europe/Samara", "Europe/Samara"),
+                    ("Europe/San_Marino", "Europe/San_Marino"),
+                    ("Europe/Sarajevo", "Europe/Sarajevo"),
+                    ("Europe/Saratov", "Europe/Saratov"),
+                    ("Europe/Simferopol", "Europe/Simferopol"),
+                    ("Europe/Skopje", "Europe/Skopje"),
+                    ("Europe/Sofia", "Europe/Sofia"),
+                    ("Europe/Stockholm", "Europe/Stockholm"),
+                    ("Europe/Tallinn", "Europe/Tallinn"),
+                    ("Europe/Tirane", "Europe/Tirane"),
+                    ("Europe/Ulyanovsk", "Europe/Ulyanovsk"),
+                    ("Europe/Vaduz", "Europe/Vaduz"),
+                    ("Europe/Vatican", "Europe/Vatican"),
+                    ("Europe/Vienna", "Europe/Vienna"),
+                    ("Europe/Vilnius", "Europe/Vilnius"),
+                    ("Europe/Volgograd", "Europe/Volgograd"),
+                    ("Europe/Warsaw", "Europe/Warsaw"),
+                    ("Europe/Zagreb", "Europe/Zagreb"),
+                    ("Europe/Zurich", "Europe/Zurich"),
+                    ("GMT", "GMT"),
+                    ("Indian/Antananarivo", "Indian/Antananarivo"),
+                    ("Indian/Chagos", "Indian/Chagos"),
+                    ("Indian/Christmas", "Indian/Christmas"),
+                    ("Indian/Cocos", "Indian/Cocos"),
+                    ("Indian/Comoro", "Indian/Comoro"),
+                    ("Indian/Kerguelen", "Indian/Kerguelen"),
+                    ("Indian/Mahe", "Indian/Mahe"),
+                    ("Indian/Maldives", "Indian/Maldives"),
+                    ("Indian/Mauritius", "Indian/Mauritius"),
+                    ("Indian/Mayotte", "Indian/Mayotte"),
+                    ("Indian/Reunion", "Indian/Reunion"),
+                    ("Pacific/Apia", "Pacific/Apia"),
+                    ("Pacific/Auckland", "Pacific/Auckland"),
+                    ("Pacific/Bougainville", "Pacific/Bougainville"),
+                    ("Pacific/Chatham", "Pacific/Chatham"),
+                    ("Pacific/Chuuk", "Pacific/Chuuk"),
+                    ("Pacific/Easter", "Pacific/Easter"),
+                    ("Pacific/Efate", "Pacific/Efate"),
+                    ("Pacific/Fakaofo", "Pacific/Fakaofo"),
+                    ("Pacific/Fiji", "Pacific/Fiji"),
+                    ("Pacific/Funafuti", "Pacific/Funafuti"),
+                    ("Pacific/Galapagos", "Pacific/Galapagos"),
+                    ("Pacific/Gambier", "Pacific/Gambier"),
+                    ("Pacific/Guadalcanal", "Pacific/Guadalcanal"),
+                    ("Pacific/Guam", "Pacific/Guam"),
+                    ("Pacific/Honolulu", "Pacific/Honolulu"),
+                    ("Pacific/Kanton", "Pacific/Kanton"),
+                    ("Pacific/Kiritimati", "Pacific/Kiritimati"),
+                    ("Pacific/Kosrae", "Pacific/Kosrae"),
+                    ("Pacific/Kwajalein", "Pacific/Kwajalein"),
+                    ("Pacific/Majuro", "Pacific/Majuro"),
+                    ("Pacific/Marquesas", "Pacific/Marquesas"),
+                    ("Pacific/Midway", "Pacific/Midway"),
+                    ("Pacific/Nauru", "Pacific/Nauru"),
+                    ("Pacific/Niue", "Pacific/Niue"),
+                    ("Pacific/Norfolk", "Pacific/Norfolk"),
+                    ("Pacific/Noumea", "Pacific/Noumea"),
+                    ("Pacific/Pago_Pago", "Pacific/Pago_Pago"),
+                    ("Pacific/Palau", "Pacific/Palau"),
+                    ("Pacific/Pitcairn", "Pacific/Pitcairn"),
+                    ("Pacific/Pohnpei", "Pacific/Pohnpei"),
+                    ("Pacific/Port_Moresby", "Pacific/Port_Moresby"),
+                    ("Pacific/Rarotonga", "Pacific/Rarotonga"),
+                    ("Pacific/Saipan", "Pacific/Saipan"),
+                    ("Pacific/Tahiti", "Pacific/Tahiti"),
+                    ("Pacific/Tarawa", "Pacific/Tarawa"),
+                    ("Pacific/Tongatapu", "Pacific/Tongatapu"),
+                    ("Pacific/Wake", "Pacific/Wake"),
+                    ("Pacific/Wallis", "Pacific/Wallis"),
+                    ("US/Alaska", "US/Alaska"),
+                    ("US/Arizona", "US/Arizona"),
+                    ("US/Central", "US/Central"),
+                    ("US/Eastern", "US/Eastern"),
+                    ("US/Hawaii", "US/Hawaii"),
+                    ("US/Mountain", "US/Mountain"),
+                    ("US/Pacific", "US/Pacific"),
+                    ("UTC", "UTC"),
+                ],
+                default="auto",
+                max_length=50,
+                verbose_name="Time Zone",
+            ),
+        ),
+    ]

app/apps/users/models.py

@@ -2,11 +2,449 @@ import pytz
 from django.conf import settings
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import AbstractUser, Group
+from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
 from django.utils.translation import gettext_lazy as _
 
 from apps.users.managers import UserManager
 
+timezones = [
+    ("auto", _("Auto")),
+    ("Africa/Abidjan", "Africa/Abidjan"),
+    ("Africa/Accra", "Africa/Accra"),
+    ("Africa/Addis_Ababa", "Africa/Addis_Ababa"),
+    ("Africa/Algiers", "Africa/Algiers"),
+    ("Africa/Asmara", "Africa/Asmara"),
+    ("Africa/Bamako", "Africa/Bamako"),
+    ("Africa/Bangui", "Africa/Bangui"),
+    ("Africa/Banjul", "Africa/Banjul"),
+    ("Africa/Bissau", "Africa/Bissau"),
+    ("Africa/Blantyre", "Africa/Blantyre"),
+    ("Africa/Brazzaville", "Africa/Brazzaville"),
+    ("Africa/Bujumbura", "Africa/Bujumbura"),
+    ("Africa/Cairo", "Africa/Cairo"),
+    ("Africa/Casablanca", "Africa/Casablanca"),
+    ("Africa/Ceuta", "Africa/Ceuta"),
+    ("Africa/Conakry", "Africa/Conakry"),
+    ("Africa/Dakar", "Africa/Dakar"),
+    ("Africa/Dar_es_Salaam", "Africa/Dar_es_Salaam"),
+    ("Africa/Djibouti", "Africa/Djibouti"),
+    ("Africa/Douala", "Africa/Douala"),
+    ("Africa/El_Aaiun", "Africa/El_Aaiun"),
+    ("Africa/Freetown", "Africa/Freetown"),
+    ("Africa/Gaborone", "Africa/Gaborone"),
+    ("Africa/Harare", "Africa/Harare"),
+    ("Africa/Johannesburg", "Africa/Johannesburg"),
+    ("Africa/Juba", "Africa/Juba"),
+    ("Africa/Kampala", "Africa/Kampala"),
+    ("Africa/Khartoum", "Africa/Khartoum"),
+    ("Africa/Kigali", "Africa/Kigali"),
+    ("Africa/Kinshasa", "Africa/Kinshasa"),
+    ("Africa/Lagos", "Africa/Lagos"),
+    ("Africa/Libreville", "Africa/Libreville"),
+    ("Africa/Lome", "Africa/Lome"),
+    ("Africa/Luanda", "Africa/Luanda"),
+    ("Africa/Lubumbashi", "Africa/Lubumbashi"),
+    ("Africa/Lusaka", "Africa/Lusaka"),
+    ("Africa/Malabo", "Africa/Malabo"),
+    ("Africa/Maputo", "Africa/Maputo"),
+    ("Africa/Maseru", "Africa/Maseru"),
+    ("Africa/Mbabane", "Africa/Mbabane"),
+    ("Africa/Mogadishu", "Africa/Mogadishu"),
+    ("Africa/Monrovia", "Africa/Monrovia"),
+    ("Africa/Nairobi", "Africa/Nairobi"),
+    ("Africa/Ndjamena", "Africa/Ndjamena"),
+    ("Africa/Niamey", "Africa/Niamey"),
+    ("Africa/Nouakchott", "Africa/Nouakchott"),
+    ("Africa/Ouagadougou", "Africa/Ouagadougou"),
+    ("Africa/Porto-Novo", "Africa/Porto-Novo"),
+    ("Africa/Sao_Tome", "Africa/Sao_Tome"),
+    ("Africa/Tripoli", "Africa/Tripoli"),
+    ("Africa/Tunis", "Africa/Tunis"),
+    ("Africa/Windhoek", "Africa/Windhoek"),
+    ("America/Adak", "America/Adak"),
+    ("America/Anchorage", "America/Anchorage"),
+    ("America/Anguilla", "America/Anguilla"),
+    ("America/Antigua", "America/Antigua"),
+    ("America/Araguaina", "America/Araguaina"),
+    ("America/Argentina/Buenos_Aires", "America/Argentina/Buenos_Aires"),
+    ("America/Argentina/Catamarca", "America/Argentina/Catamarca"),
+    ("America/Argentina/Cordoba", "America/Argentina/Cordoba"),
+    ("America/Argentina/Jujuy", "America/Argentina/Jujuy"),
+    ("America/Argentina/La_Rioja", "America/Argentina/La_Rioja"),
+    ("America/Argentina/Mendoza", "America/Argentina/Mendoza"),
+    ("America/Argentina/Rio_Gallegos", "America/Argentina/Rio_Gallegos"),
+    ("America/Argentina/Salta", "America/Argentina/Salta"),
+    ("America/Argentina/San_Juan", "America/Argentina/San_Juan"),
+    ("America/Argentina/San_Luis", "America/Argentina/San_Luis"),
+    ("America/Argentina/Tucuman", "America/Argentina/Tucuman"),
+    ("America/Argentina/Ushuaia", "America/Argentina/Ushuaia"),
+    ("America/Aruba", "America/Aruba"),
+    ("America/Asuncion", "America/Asuncion"),
+    ("America/Atikokan", "America/Atikokan"),
+    ("America/Bahia", "America/Bahia"),
+    ("America/Bahia_Banderas", "America/Bahia_Banderas"),
+    ("America/Barbados", "America/Barbados"),
+    ("America/Belem", "America/Belem"),
+    ("America/Belize", "America/Belize"),
+    ("America/Blanc-Sablon", "America/Blanc-Sablon"),
+    ("America/Boa_Vista", "America/Boa_Vista"),
+    ("America/Bogota", "America/Bogota"),
+    ("America/Boise", "America/Boise"),
+    ("America/Cambridge_Bay", "America/Cambridge_Bay"),
+    ("America/Campo_Grande", "America/Campo_Grande"),
+    ("America/Cancun", "America/Cancun"),
+    ("America/Caracas", "America/Caracas"),
+    ("America/Cayenne", "America/Cayenne"),
+    ("America/Cayman", "America/Cayman"),
+    ("America/Chicago", "America/Chicago"),
+    ("America/Chihuahua", "America/Chihuahua"),
+    ("America/Ciudad_Juarez", "America/Ciudad_Juarez"),
+    ("America/Costa_Rica", "America/Costa_Rica"),
+    ("America/Coyhaique", "America/Coyhaique"),
+    ("America/Creston", "America/Creston"),
+    ("America/Cuiaba", "America/Cuiaba"),
+    ("America/Curacao", "America/Curacao"),
+    ("America/Danmarkshavn", "America/Danmarkshavn"),
+    ("America/Dawson", "America/Dawson"),
+    ("America/Dawson_Creek", "America/Dawson_Creek"),
+    ("America/Denver", "America/Denver"),
+    ("America/Detroit", "America/Detroit"),
+    ("America/Dominica", "America/Dominica"),
+    ("America/Edmonton", "America/Edmonton"),
+    ("America/Eirunepe", "America/Eirunepe"),
+    ("America/El_Salvador", "America/El_Salvador"),
+    ("America/Fort_Nelson", "America/Fort_Nelson"),
+    ("America/Fortaleza", "America/Fortaleza"),
+    ("America/Glace_Bay", "America/Glace_Bay"),
+    ("America/Goose_Bay", "America/Goose_Bay"),
+    ("America/Grand_Turk", "America/Grand_Turk"),
+    ("America/Grenada", "America/Grenada"),
+    ("America/Guadeloupe", "America/Guadeloupe"),
+    ("America/Guatemala", "America/Guatemala"),
+    ("America/Guayaquil", "America/Guayaquil"),
+    ("America/Guyana", "America/Guyana"),
+    ("America/Halifax", "America/Halifax"),
+    ("America/Havana", "America/Havana"),
+    ("America/Hermosillo", "America/Hermosillo"),
+    ("America/Indiana/Indianapolis", "America/Indiana/Indianapolis"),
+    ("America/Indiana/Knox", "America/Indiana/Knox"),
+    ("America/Indiana/Marengo", "America/Indiana/Marengo"),
+    ("America/Indiana/Petersburg", "America/Indiana/Petersburg"),
+    ("America/Indiana/Tell_City", "America/Indiana/Tell_City"),
+    ("America/Indiana/Vevay", "America/Indiana/Vevay"),
+    ("America/Indiana/Vincennes", "America/Indiana/Vincennes"),
+    ("America/Indiana/Winamac", "America/Indiana/Winamac"),
+    ("America/Inuvik", "America/Inuvik"),
+    ("America/Iqaluit", "America/Iqaluit"),
+    ("America/Jamaica", "America/Jamaica"),
+    ("America/Juneau", "America/Juneau"),
+    ("America/Kentucky/Louisville", "America/Kentucky/Louisville"),
+    ("America/Kentucky/Monticello", "America/Kentucky/Monticello"),
+    ("America/Kralendijk", "America/Kralendijk"),
+    ("America/La_Paz", "America/La_Paz"),
+    ("America/Lima", "America/Lima"),
+    ("America/Los_Angeles", "America/Los_Angeles"),
+    ("America/Lower_Princes", "America/Lower_Princes"),
+    ("America/Maceio", "America/Maceio"),
+    ("America/Managua", "America/Managua"),
+    ("America/Manaus", "America/Manaus"),
+    ("America/Marigot", "America/Marigot"),
+    ("America/Martinique", "America/Martinique"),
+    ("America/Matamoros", "America/Matamoros"),
+    ("America/Mazatlan", "America/Mazatlan"),
+    ("America/Menominee", "America/Menominee"),
+    ("America/Merida", "America/Merida"),
+    ("America/Metlakatla", "America/Metlakatla"),
+    ("America/Mexico_City", "America/Mexico_City"),
+    ("America/Miquelon", "America/Miquelon"),
+    ("America/Moncton", "America/Moncton"),
+    ("America/Monterrey", "America/Monterrey"),
+    ("America/Montevideo", "America/Montevideo"),
+    ("America/Montserrat", "America/Montserrat"),
+    ("America/Nassau", "America/Nassau"),
+    ("America/New_York", "America/New_York"),
+    ("America/Nome", "America/Nome"),
+    ("America/Noronha", "America/Noronha"),
+    ("America/North_Dakota/Beulah", "America/North_Dakota/Beulah"),
+    ("America/North_Dakota/Center", "America/North_Dakota/Center"),
+    ("America/North_Dakota/New_Salem", "America/North_Dakota/New_Salem"),
+    ("America/Nuuk", "America/Nuuk"),
+    ("America/Ojinaga", "America/Ojinaga"),
+    ("America/Panama", "America/Panama"),
+    ("America/Paramaribo", "America/Paramaribo"),
+    ("America/Phoenix", "America/Phoenix"),
+    ("America/Port-au-Prince", "America/Port-au-Prince"),
+    ("America/Port_of_Spain", "America/Port_of_Spain"),
+    ("America/Porto_Velho", "America/Porto_Velho"),
+    ("America/Puerto_Rico", "America/Puerto_Rico"),
+    ("America/Punta_Arenas", "America/Punta_Arenas"),
+    ("America/Rankin_Inlet", "America/Rankin_Inlet"),
+    ("America/Recife", "America/Recife"),
+    ("America/Regina", "America/Regina"),
+    ("America/Resolute", "America/Resolute"),
+    ("America/Rio_Branco", "America/Rio_Branco"),
+    ("America/Santarem", "America/Santarem"),
+    ("America/Santiago", "America/Santiago"),
+    ("America/Santo_Domingo", "America/Santo_Domingo"),
+    ("America/Sao_Paulo", "America/Sao_Paulo"),
+    ("America/Scoresbysund", "America/Scoresbysund"),
+    ("America/Sitka", "America/Sitka"),
+    ("America/St_Barthelemy", "America/St_Barthelemy"),
+    ("America/St_Johns", "America/St_Johns"),
+    ("America/St_Kitts", "America/St_Kitts"),
+    ("America/St_Lucia", "America/St_Lucia"),
+    ("America/St_Thomas", "America/St_Thomas"),
+    ("America/St_Vincent", "America/St_Vincent"),
+    ("America/Swift_Current", "America/Swift_Current"),
+    ("America/Tegucigalpa", "America/Tegucigalpa"),
+    ("America/Thule", "America/Thule"),
+    ("America/Tijuana", "America/Tijuana"),
+    ("America/Toronto", "America/Toronto"),
+    ("America/Tortola", "America/Tortola"),
+    ("America/Vancouver", "America/Vancouver"),
+    ("America/Whitehorse", "America/Whitehorse"),
+    ("America/Winnipeg", "America/Winnipeg"),
+    ("America/Yakutat", "America/Yakutat"),
+    ("Antarctica/Casey", "Antarctica/Casey"),
+    ("Antarctica/Davis", "Antarctica/Davis"),
+    ("Antarctica/DumontDUrville", "Antarctica/DumontDUrville"),
+    ("Antarctica/Macquarie", "Antarctica/Macquarie"),
+    ("Antarctica/Mawson", "Antarctica/Mawson"),
+    ("Antarctica/McMurdo", "Antarctica/McMurdo"),
+    ("Antarctica/Palmer", "Antarctica/Palmer"),
+    ("Antarctica/Rothera", "Antarctica/Rothera"),
+    ("Antarctica/Syowa", "Antarctica/Syowa"),
+    ("Antarctica/Troll", "Antarctica/Troll"),
+    ("Antarctica/Vostok", "Antarctica/Vostok"),
+    ("Arctic/Longyearbyen", "Arctic/Longyearbyen"),
+    ("Asia/Aden", "Asia/Aden"),
+    ("Asia/Almaty", "Asia/Almaty"),
+    ("Asia/Amman", "Asia/Amman"),
+    ("Asia/Anadyr", "Asia/Anadyr"),
+    ("Asia/Aqtau", "Asia/Aqtau"),
+    ("Asia/Aqtobe", "Asia/Aqtobe"),
+    ("Asia/Ashgabat", "Asia/Ashgabat"),
+    ("Asia/Atyrau", "Asia/Atyrau"),
+    ("Asia/Baghdad", "Asia/Baghdad"),
+    ("Asia/Bahrain", "Asia/Bahrain"),
+    ("Asia/Baku", "Asia/Baku"),
+    ("Asia/Bangkok", "Asia/Bangkok"),
+    ("Asia/Barnaul", "Asia/Barnaul"),
+    ("Asia/Beirut", "Asia/Beirut"),
+    ("Asia/Bishkek", "Asia/Bishkek"),
+    ("Asia/Brunei", "Asia/Brunei"),
+    ("Asia/Chita", "Asia/Chita"),
+    ("Asia/Colombo", "Asia/Colombo"),
+    ("Asia/Damascus", "Asia/Damascus"),
+    ("Asia/Dhaka", "Asia/Dhaka"),
+    ("Asia/Dili", "Asia/Dili"),
+    ("Asia/Dubai", "Asia/Dubai"),
+    ("Asia/Dushanbe", "Asia/Dushanbe"),
+    ("Asia/Famagusta", "Asia/Famagusta"),
+    ("Asia/Gaza", "Asia/Gaza"),
+    ("Asia/Hebron", "Asia/Hebron"),
+    ("Asia/Ho_Chi_Minh", "Asia/Ho_Chi_Minh"),
+    ("Asia/Hong_Kong", "Asia/Hong_Kong"),
+    ("Asia/Hovd", "Asia/Hovd"),
+    ("Asia/Irkutsk", "Asia/Irkutsk"),
+    ("Asia/Jakarta", "Asia/Jakarta"),
+    ("Asia/Jayapura", "Asia/Jayapura"),
+    ("Asia/Jerusalem", "Asia/Jerusalem"),
+    ("Asia/Kabul", "Asia/Kabul"),
+    ("Asia/Kamchatka", "Asia/Kamchatka"),
+    ("Asia/Karachi", "Asia/Karachi"),
+    ("Asia/Kathmandu", "Asia/Kathmandu"),
+    ("Asia/Khandyga", "Asia/Khandyga"),
+    ("Asia/Kolkata", "Asia/Kolkata"),
+    ("Asia/Krasnoyarsk", "Asia/Krasnoyarsk"),
+    ("Asia/Kuala_Lumpur", "Asia/Kuala_Lumpur"),
+    ("Asia/Kuching", "Asia/Kuching"),
+    ("Asia/Kuwait", "Asia/Kuwait"),
+    ("Asia/Macau", "Asia/Macau"),
+    ("Asia/Magadan", "Asia/Magadan"),
+    ("Asia/Makassar", "Asia/Makassar"),
+    ("Asia/Manila", "Asia/Manila"),
+    ("Asia/Muscat", "Asia/Muscat"),
+    ("Asia/Nicosia", "Asia/Nicosia"),
+    ("Asia/Novokuznetsk", "Asia/Novokuznetsk"),
+    ("Asia/Novosibirsk", "Asia/Novosibirsk"),
+    ("Asia/Omsk", "Asia/Omsk"),
+    ("Asia/Oral", "Asia/Oral"),
+    ("Asia/Phnom_Penh", "Asia/Phnom_Penh"),
+    ("Asia/Pontianak", "Asia/Pontianak"),
+    ("Asia/Pyongyang", "Asia/Pyongyang"),
+    ("Asia/Qatar", "Asia/Qatar"),
+    ("Asia/Qostanay", "Asia/Qostanay"),
+    ("Asia/Qyzylorda", "Asia/Qyzylorda"),
+    ("Asia/Riyadh", "Asia/Riyadh"),
+    ("Asia/Sakhalin", "Asia/Sakhalin"),
+    ("Asia/Samarkand", "Asia/Samarkand"),
+    ("Asia/Seoul", "Asia/Seoul"),
+    ("Asia/Shanghai", "Asia/Shanghai"),
+    ("Asia/Singapore", "Asia/Singapore"),
+    ("Asia/Srednekolymsk", "Asia/Srednekolymsk"),
+    ("Asia/Taipei", "Asia/Taipei"),
+    ("Asia/Tashkent", "Asia/Tashkent"),
+    ("Asia/Tbilisi", "Asia/Tbilisi"),
+    ("Asia/Tehran", "Asia/Tehran"),
+    ("Asia/Thimphu", "Asia/Thimphu"),
+    ("Asia/Tokyo", "Asia/Tokyo"),
+    ("Asia/Tomsk", "Asia/Tomsk"),
+    ("Asia/Ulaanbaatar", "Asia/Ulaanbaatar"),
+    ("Asia/Urumqi", "Asia/Urumqi"),
+    ("Asia/Ust-Nera", "Asia/Ust-Nera"),
+    ("Asia/Vientiane", "Asia/Vientiane"),
+    ("Asia/Vladivostok", "Asia/Vladivostok"),
+    ("Asia/Yakutsk", "Asia/Yakutsk"),
+    ("Asia/Yangon", "Asia/Yangon"),
+    ("Asia/Yekaterinburg", "Asia/Yekaterinburg"),
+    ("Asia/Yerevan", "Asia/Yerevan"),
+    ("Atlantic/Azores", "Atlantic/Azores"),
+    ("Atlantic/Bermuda", "Atlantic/Bermuda"),
+    ("Atlantic/Canary", "Atlantic/Canary"),
+    ("Atlantic/Cape_Verde", "Atlantic/Cape_Verde"),
+    ("Atlantic/Faroe", "Atlantic/Faroe"),
+    ("Atlantic/Madeira", "Atlantic/Madeira"),
+    ("Atlantic/Reykjavik", "Atlantic/Reykjavik"),
+    ("Atlantic/South_Georgia", "Atlantic/South_Georgia"),
+    ("Atlantic/St_Helena", "Atlantic/St_Helena"),
+    ("Atlantic/Stanley", "Atlantic/Stanley"),
+    ("Australia/Adelaide", "Australia/Adelaide"),
+    ("Australia/Brisbane", "Australia/Brisbane"),
+    ("Australia/Broken_Hill", "Australia/Broken_Hill"),
+    ("Australia/Darwin", "Australia/Darwin"),
+    ("Australia/Eucla", "Australia/Eucla"),
+    ("Australia/Hobart", "Australia/Hobart"),
+    ("Australia/Lindeman", "Australia/Lindeman"),
+    ("Australia/Lord_Howe", "Australia/Lord_Howe"),
+    ("Australia/Melbourne", "Australia/Melbourne"),
+    ("Australia/Perth", "Australia/Perth"),
+    ("Australia/Sydney", "Australia/Sydney"),
+    ("Canada/Atlantic", "Canada/Atlantic"),
+    ("Canada/Central", "Canada/Central"),
+    ("Canada/Eastern", "Canada/Eastern"),
+    ("Canada/Mountain", "Canada/Mountain"),
+    ("Canada/Newfoundland", "Canada/Newfoundland"),
+    ("Canada/Pacific", "Canada/Pacific"),
+    ("Europe/Amsterdam", "Europe/Amsterdam"),
+    ("Europe/Andorra", "Europe/Andorra"),
+    ("Europe/Astrakhan", "Europe/Astrakhan"),
+    ("Europe/Athens", "Europe/Athens"),
+    ("Europe/Belgrade", "Europe/Belgrade"),
+    ("Europe/Berlin", "Europe/Berlin"),
+    ("Europe/Bratislava", "Europe/Bratislava"),
+    ("Europe/Brussels", "Europe/Brussels"),
+    ("Europe/Bucharest", "Europe/Bucharest"),
+    ("Europe/Budapest", "Europe/Budapest"),
+    ("Europe/Busingen", "Europe/Busingen"),
+    ("Europe/Chisinau", "Europe/Chisinau"),
+    ("Europe/Copenhagen", "Europe/Copenhagen"),
+    ("Europe/Dublin", "Europe/Dublin"),
+    ("Europe/Gibraltar", "Europe/Gibraltar"),
+    ("Europe/Guernsey", "Europe/Guernsey"),
+    ("Europe/Helsinki", "Europe/Helsinki"),
+    ("Europe/Isle_of_Man", "Europe/Isle_of_Man"),
+    ("Europe/Istanbul", "Europe/Istanbul"),
+    ("Europe/Jersey", "Europe/Jersey"),
+    ("Europe/Kaliningrad", "Europe/Kaliningrad"),
+    ("Europe/Kirov", "Europe/Kirov"),
+    ("Europe/Kyiv", "Europe/Kyiv"),
+    ("Europe/Lisbon", "Europe/Lisbon"),
+    ("Europe/Ljubljana", "Europe/Ljubljana"),
+    ("Europe/London", "Europe/London"),
+    ("Europe/Luxembourg", "Europe/Luxembourg"),
+    ("Europe/Madrid", "Europe/Madrid"),
+    ("Europe/Malta", "Europe/Malta"),
+    ("Europe/Mariehamn", "Europe/Mariehamn"),
+    ("Europe/Minsk", "Europe/Minsk"),
+    ("Europe/Monaco", "Europe/Monaco"),
+    ("Europe/Moscow", "Europe/Moscow"),
+    ("Europe/Oslo", "Europe/Oslo"),
+    ("Europe/Paris", "Europe/Paris"),
+    ("Europe/Podgorica", "Europe/Podgorica"),
+    ("Europe/Prague", "Europe/Prague"),
+    ("Europe/Riga", "Europe/Riga"),
+    ("Europe/Rome", "Europe/Rome"),
+    ("Europe/Samara", "Europe/Samara"),
+    ("Europe/San_Marino", "Europe/San_Marino"),
+    ("Europe/Sarajevo", "Europe/Sarajevo"),
+    ("Europe/Saratov", "Europe/Saratov"),
+    ("Europe/Simferopol", "Europe/Simferopol"),
+    ("Europe/Skopje", "Europe/Skopje"),
+    ("Europe/Sofia", "Europe/Sofia"),
+    ("Europe/Stockholm", "Europe/Stockholm"),
+    ("Europe/Tallinn", "Europe/Tallinn"),
+    ("Europe/Tirane", "Europe/Tirane"),
+    ("Europe/Ulyanovsk", "Europe/Ulyanovsk"),
+    ("Europe/Vaduz", "Europe/Vaduz"),
+    ("Europe/Vatican", "Europe/Vatican"),
+    ("Europe/Vienna", "Europe/Vienna"),
+    ("Europe/Vilnius", "Europe/Vilnius"),
+    ("Europe/Volgograd", "Europe/Volgograd"),
+    ("Europe/Warsaw", "Europe/Warsaw"),
+    ("Europe/Zagreb", "Europe/Zagreb"),
+    ("Europe/Zurich", "Europe/Zurich"),
+    ("GMT", "GMT"),
+    ("Indian/Antananarivo", "Indian/Antananarivo"),
+    ("Indian/Chagos", "Indian/Chagos"),
+    ("Indian/Christmas", "Indian/Christmas"),
+    ("Indian/Cocos", "Indian/Cocos"),
+    ("Indian/Comoro", "Indian/Comoro"),
+    ("Indian/Kerguelen", "Indian/Kerguelen"),
+    ("Indian/Mahe", "Indian/Mahe"),
+    ("Indian/Maldives", "Indian/Maldives"),
+    ("Indian/Mauritius", "Indian/Mauritius"),
+    ("Indian/Mayotte", "Indian/Mayotte"),
+    ("Indian/Reunion", "Indian/Reunion"),
+    ("Pacific/Apia", "Pacific/Apia"),
+    ("Pacific/Auckland", "Pacific/Auckland"),
+    ("Pacific/Bougainville", "Pacific/Bougainville"),
+    ("Pacific/Chatham", "Pacific/Chatham"),
+    ("Pacific/Chuuk", "Pacific/Chuuk"),
+    ("Pacific/Easter", "Pacific/Easter"),
+    ("Pacific/Efate", "Pacific/Efate"),
+    ("Pacific/Fakaofo", "Pacific/Fakaofo"),
+    ("Pacific/Fiji", "Pacific/Fiji"),
+    ("Pacific/Funafuti", "Pacific/Funafuti"),
+    ("Pacific/Galapagos", "Pacific/Galapagos"),
+    ("Pacific/Gambier", "Pacific/Gambier"),
+    ("Pacific/Guadalcanal", "Pacific/Guadalcanal"),
+    ("P2025-06-29T01:43:14.671389745Z acific/Guam", "Pacific/Guam"),
+    ("Pacific/Honolulu", "Pacific/Honolulu"),
+    ("Pacific/Kanton", "Pacific/Kanton"),
+    ("Pacific/Kiritimati", "Pacific/Kiritimati"),
+    ("Pacific/Kosrae", "Pacific/Kosrae"),
+    ("Pacific/Kwajalein", "Pacific/Kwajalein"),
+    ("Pacific/Majuro", "Pacific/Majuro"),
+    ("Pacific/Marquesas", "Pacific/Marquesas"),
+    ("Pacific/Midway", "Pacific/Midway"),
+    ("Pacific/Nauru", "Pacific/Nauru"),
+    ("Pacific/Niue", "Pacific/Niue"),
+    ("Pacific/Norfolk", "Pacific/Norfolk"),
+    ("Pacific/Noumea", "Pacific/Noumea"),
+    ("Pacific/Pago_Pago", "Pacific/Pago_Pago"),
+    ("Pacific/Palau", "Pacific/Palau"),
+    ("Pacific/Pitcairn", "Pacific/Pitcairn"),
+    ("Pacific/Pohnpei", "Pacific/Pohnpei"),
+    ("Pacific/Port_Moresby", "Pacific/Port_Moresby"),
+    ("Pacific/Rarotonga", "Pacific/Rarotonga"),
+    ("Pacific/Saipan", "Pacific/Saipan"),
+    ("Pacific/Tahiti", "Pacific/Tahiti"),
+    ("Pacific/Tarawa", "Pacific/Tarawa"),
+    ("Pacific/Tongatapu", "Pacific/Tongatapu"),
+    ("Pacific/Wake", "Pacific/Wake"),
+    ("Pacific/Wallis", "Pacific/Wallis"),
+    ("US/Alaska", "US/Alaska"),
+    ("US/Arizona", "US/Arizona"),
+    ("US/Central", "US/Central"),
+    ("US/Eastern", "US/Eastern"),
+    ("US/Hawaii", "US/Hawaii"),
+    ("US/Mountain", "US/Mountain"),
+    ("US/Pacific", "US/Pacific"),
+    ("UTC", "UTC"),
+]
+
 
 class User(AbstractUser):
     username = None
@@ -36,6 +474,11 @@ class UserSettings(models.Model):
     )
     hide_amounts = models.BooleanField(default=False)
     mute_sounds = models.BooleanField(default=False)
+    volume = models.PositiveIntegerField(
+        default=10,
+        validators=[MinValueValidator(1), MaxValueValidator(10)],
+        verbose_name=_("Volume"),
+    )
 
     date_format = models.CharField(
         max_length=100, default="SHORT_DATE_FORMAT", verbose_name=_("Date Format")
@@ -57,7 +500,7 @@ class UserSettings(models.Model):
     )
     timezone = models.CharField(
         max_length=50,
-        choices=[("auto", _("Auto"))] + [(tz, tz) for tz in pytz.common_timezones],
+        choices=timezones,
         default="auto",
         verbose_name=_("Time Zone"),
     )

app/apps/users/tests.py

@@ -1,150 +0,0 @@
-from django.test import TestCase
-from django.urls import reverse
-from django.contrib.auth import get_user_model
-from django.utils.translation import gettext_lazy as _
-
-User = get_user_model()
-
-
-class UserAuthTests(TestCase):
-    def setUp(self):
-        self.user_credentials = {
-            "email": "testuser@example.com",
-            "password": "testpassword123",
-        }
-        self.user = User.objects.create_user(**self.user_credentials)
-
-    def test_user_creation(self):
-        self.assertEqual(User.objects.count(), 1)
-        self.assertEqual(self.user.email, self.user_credentials["email"])
-        self.assertTrue(self.user.check_password(self.user_credentials["password"]))
-
-    def test_user_login(self):
-        # Check that the user can log in with correct credentials
-        login_url = reverse("login")
-        response = self.client.post(login_url, self.user_credentials)
-        self.assertEqual(response.status_code, 302)  # Redirects on successful login
-        # Assuming 'index' is the name of the view users are redirected to after login.
-        # You might need to change "index" to whatever your project uses.
-        self.assertRedirects(response, reverse("index"))
-        self.assertTrue("_auth_user_id" in self.client.session)
-
-    def test_user_login_invalid_credentials(self):
-        # Check that login fails with incorrect credentials
-        login_url = reverse("login")
-        invalid_credentials = {
-            "email": self.user_credentials["email"],
-            "password": "wrongpassword",
-        }
-        response = self.client.post(login_url, invalid_credentials)
-        self.assertEqual(response.status_code, 200)  # Stays on the login page
-        self.assertFormError(response, "form", None, _("Invalid e-mail or password"))
-        self.assertFalse("_auth_user_id" in self.client.session)
-
-
-    def test_user_logout(self):
-        # Log in the user first
-        self.client.login(**self.user_credentials)
-        self.assertTrue("_auth_user_id" in self.client.session)
-
-        # Test logout
-        logout_url = reverse("logout")
-        response = self.client.get(logout_url)
-        self.assertEqual(response.status_code, 302)  # Redirects on successful logout
-        self.assertRedirects(response, reverse("login"))
-        self.assertFalse("_auth_user_id" in self.client.session)
-
-
-class UserProfileUpdateTests(TestCase):
-    def setUp(self):
-        self.user_credentials = {
-            "email": "testuser@example.com",
-            "password": "testpassword123",
-            "first_name": "Test",
-            "last_name": "User",
-        }
-        self.user = User.objects.create_user(**self.user_credentials)
-
-        self.superuser_credentials = {
-            "email": "superuser@example.com",
-            "password": "superpassword123",
-        }
-        self.superuser = User.objects.create_superuser(**self.superuser_credentials)
-
-        self.edit_url = reverse("user_edit", kwargs={"pk": self.user.pk})
-        self.update_data = {
-            "first_name": "Updated First Name",
-            "last_name": "Updated Last Name",
-            "email": "updateduser@example.com",
-        }
-
-    def test_user_can_update_own_profile(self):
-        self.client.login(email=self.user_credentials["email"], password=self.user_credentials["password"])
-        response = self.client.post(self.edit_url, self.update_data)
-        self.assertEqual(response.status_code, 204) # Successful update returns HX-Trigger with 204
-        self.user.refresh_from_db()
-        self.assertEqual(self.user.first_name, self.update_data["first_name"])
-        self.assertEqual(self.user.last_name, self.update_data["last_name"])
-        self.assertEqual(self.user.email, self.update_data["email"])
-
-    def test_user_cannot_update_other_user_profile(self):
-        # Create another regular user
-        other_user_credentials = {
-            "email": "otheruser@example.com",
-            "password": "otherpassword123",
-        }
-        other_user = User.objects.create_user(**other_user_credentials)
-        other_user_edit_url = reverse("user_edit", kwargs={"pk": other_user.pk})
-
-        # Log in as the first user
-        self.client.login(email=self.user_credentials["email"], password=self.user_credentials["password"])
-
-        # Attempt to update other_user's profile
-        response = self.client.post(other_user_edit_url, self.update_data)
-        self.assertEqual(response.status_code, 403)  # PermissionDenied
-
-        other_user.refresh_from_db()
-        self.assertNotEqual(other_user.first_name, self.update_data["first_name"])
-
-    def test_superuser_can_update_other_user_profile(self):
-        self.client.login(email=self.superuser_credentials["email"], password=self.superuser_credentials["password"])
-        response = self.client.post(self.edit_url, self.update_data)
-        self.assertEqual(response.status_code, 204) # Successful update returns HX-Trigger with 204
-
-        self.user.refresh_from_db()
-        self.assertEqual(self.user.first_name, self.update_data["first_name"])
-        self.assertEqual(self.user.last_name, self.update_data["last_name"])
-        self.assertEqual(self.user.email, self.update_data["email"])
-
-    def test_profile_update_password_change(self):
-        self.client.login(email=self.user_credentials["email"], password=self.user_credentials["password"])
-        password_data = {
-            "new_password1": "newsecurepassword",
-            "new_password2": "newsecurepassword",
-        }
-        # Include existing data to pass form validation for other fields if they are required
-        full_update_data = {**self.update_data, **password_data}
-        response = self.client.post(self.edit_url, full_update_data)
-        self.assertEqual(response.status_code, 204)
-
-        self.user.refresh_from_db()
-        self.assertTrue(self.user.check_password(password_data["new_password1"]))
-        # Ensure other details were also updated
-        self.assertEqual(self.user.first_name, self.update_data["first_name"])
-
-    def test_profile_update_password_mismatch(self):
-        self.client.login(email=self.user_credentials["email"], password=self.user_credentials["password"])
-        password_data = {
-            "new_password1": "newsecurepassword",
-            "new_password2": "mismatchedpassword", # Passwords don't match
-        }
-        full_update_data = {**self.update_data, **password_data}
-        response = self.client.post(self.edit_url, full_update_data)
-        self.assertEqual(response.status_code, 200) # Should return the form with errors
-        self.assertContains(response, "The two password fields didn't match.") # Check for error message
-
-        self.user.refresh_from_db()
-        # Ensure password was NOT changed
-        self.assertTrue(self.user.check_password(self.user_credentials["password"]))
-        # Ensure other details were also NOT updated due to form error
-        self.assertNotEqual(self.user.first_name, self.update_data["first_name"])

app/templates/account_groups/fragments/list.html

@@ -1,9 +1,9 @@
 {% load i18n %}
 <div class="container px-md-3 py-3 column-gap-5">
-  <div class="tw-text-3xl fw-bold font-monospace tw-w-full mb-3">
+  <div class="tw:text-3xl fw-bold font-monospace tw:w-full mb-3">
     {% spaceless %}
       <div>{% translate 'Account Groups' %}<span>
-      <a class="text-decoration-none tw-text-2xl p-1 category-action"
+      <a class="text-decoration-none tw:text-2xl p-1 category-action"
          role="button"
          data-bs-toggle="tooltip"
          data-bs-title="{% translate "Add" %}"

app/templates/accounts/fragments/list.html

@@ -1,9 +1,9 @@
 {% load i18n %}
 <div class="container px-md-3 py-3 column-gap-5">
-  <div class="tw-text-3xl fw-bold font-monospace tw-w-full mb-3">
+  <div class="tw:text-3xl fw-bold font-monospace tw:w-full mb-3">
     {% spaceless %}
     <div>{% translate 'Accounts' %}<span>
-      <a class="text-decoration-none tw-text-2xl p-1 category-action"
+      <a class="text-decoration-none tw:text-2xl p-1 category-action"
                 role="button"
                 data-bs-toggle="tooltip"
                 data-bs-title="{% translate "Add" %}"

app/templates/calendar_view/fragments/list.html

@@ -2,7 +2,7 @@
 {% load i18n %}
 
 <div>
-  <div class="tw-hidden lg:tw-grid lg:tw-grid-cols-7 tw-gap-4 lg:tw-gap-0">
+  <div class="tw:hidden tw:lg:grid tw:lg:grid-cols-7 tw:gap-4 tw:lg:gap-0">
     <div class="border-start border-top border-bottom p-2 text-center">
       {% translate 'MON' %}
     </div>
@@ -25,44 +25,44 @@
       {% translate 'SUN' %}
     </div>
   </div>
-  <div class="tw-grid tw-grid-cols-1 tw-grid-rows-1 lg:tw-grid-cols-7 lg:tw-grid-rows-6 tw-gap-4 lg:tw-gap-0">
+  <div class="tw:grid tw:grid-cols-1 tw:grid-rows-1 tw:lg:grid-cols-7 tw:lg:grid-rows-6 tw:gap-4 tw:lg:gap-0">
     {% for date in dates %}
       {% if date %}
-      <div class="card h-100 hover:tw-bg-zinc-900 rounded-0{% if not date.transactions %} !tw-hidden lg:!tw-flex{% endif %}{% if today == date.date %} tw-border-yellow-300 border-primary{% endif %} " role="button"
+      <div class="card h-100 tw:hover:bg-zinc-900! rounded-0{% if not date.transactions %} tw:hidden! tw:lg:flex!{% endif %}{% if today == date.date %} tw:border-yellow-300 border-primary{% endif %} " role="button"
         hx-get="{% url 'calendar_transactions_list' day=date.date.day month=date.date.month year=date.date.year %}"
         hx-target="#persistent-generic-offcanvas-left">
-        <div class="card-header border-0 bg-transparent text-end tw-flex justify-content-between p-2 w-100">
-          <div class="lg:tw-hidden text-start w-100">{{ date.date|date:"l"|lower }}</div>
+        <div class="card-header border-0 bg-transparent text-end tw:flex justify-content-between p-2 w-100">
+          <div class="tw:lg:hidden text-start w-100">{{ date.date|date:"l"|lower }}</div>
           <div class="text-end w-100">{{ date.day }}</div>
         </div>
         <div class="card-body p-2">
           {% for transaction in date.transactions %}
             {% if transaction.is_paid %}
               {% if transaction.type == "IN" and not transaction.account.is_asset %}
-                <i class="fa-solid fa-circle-check tw-text-green-400" data-bs-toggle="tooltip" data-bs-title="{% if transaction.description %}{{ transaction.description }}{% else %}{% trans 'Income' %}{% endif %}"></i>
+                <i class="fa-solid fa-circle-check tw:text-green-400" data-bs-toggle="tooltip" data-bs-title="{% if transaction.description %}{{ transaction.description }}{% else %}{% trans 'Income' %}{% endif %}"></i>
               {% elif transaction.type == "IN" and transaction.account.is_asset %}
-                <i class="fa-solid fa-circle-check tw-text-green-300" data-bs-toggle="tooltip" data-bs-title="{% if transaction.description %}{{ transaction.description }}{% else %}{% trans 'Income' %}{% endif %}"></i>
+                <i class="fa-solid fa-circle-check tw:text-green-300" data-bs-toggle="tooltip" data-bs-title="{% if transaction.description %}{{ transaction.description }}{% else %}{% trans 'Income' %}{% endif %}"></i>
               {% elif transaction.type == "EX" and not transaction.account.is_asset %}
-                <i class="fa-solid fa-circle-check tw-text-red-400" data-bs-toggle="tooltip" data-bs-title="{% if transaction.description %}{{ transaction.description }}{% else %}{% trans 'Expense' %}{% endif %}"></i>
+                <i class="fa-solid fa-circle-check tw:text-red-400" data-bs-toggle="tooltip" data-bs-title="{% if transaction.description %}{{ transaction.description }}{% else %}{% trans 'Expense' %}{% endif %}"></i>
               {% elif transaction.type == "EX" and transaction.account.is_asset %}
-                <i class="fa-solid fa-circle-check tw-text-red-300" data-bs-toggle="tooltip" data-bs-title="{% if transaction.description %}{{ transaction.description }}{% else %}{% trans 'Expense' %}{% endif %}"></i>
+                <i class="fa-solid fa-circle-check tw:text-red-300" data-bs-toggle="tooltip" data-bs-title="{% if transaction.description %}{{ transaction.description }}{% else %}{% trans 'Expense' %}{% endif %}"></i>
               {% endif %}
             {% else %}
               {% if transaction.type == "IN" and not transaction.account.is_asset %}
-                <i class="fa-regular fa-circle tw-text-green-400" data-bs-toggle="tooltip" data-bs-title="{% if transaction.description %}{{ transaction.description }}{% else %}{% trans 'Income' %}{% endif %}"></i>
+                <i class="fa-regular fa-circle tw:text-green-400" data-bs-toggle="tooltip" data-bs-title="{% if transaction.description %}{{ transaction.description }}{% else %}{% trans 'Income' %}{% endif %}"></i>
               {% elif transaction.type == "IN" and transaction.account.is_asset %}
-                <i class="fa-regular fa-circle tw-text-green-300" data-bs-toggle="tooltip" data-bs-title="{% if transaction.description %}{{ transaction.description }}{% else %}{% trans 'Income' %}{% endif %}"></i>
+                <i class="fa-regular fa-circle tw:text-green-300" data-bs-toggle="tooltip" data-bs-title="{% if transaction.description %}{{ transaction.description }}{% else %}{% trans 'Income' %}{% endif %}"></i>
               {% elif transaction.type == "EX" and not transaction.account.is_asset %}
-                <i class="fa-regular fa-circle tw-text-red-400" data-bs-toggle="tooltip" data-bs-title="{% if transaction.description %}{{ transaction.description }}{% else %}{% trans 'Expense' %}{% endif %}"></i>
+                <i class="fa-regular fa-circle tw:text-red-400" data-bs-toggle="tooltip" data-bs-title="{% if transaction.description %}{{ transaction.description }}{% else %}{% trans 'Expense' %}{% endif %}"></i>
               {% elif transaction.type == "EX" and transaction.account.is_asset %}
-                <i class="fa-regular fa-circle tw-text-red-300" data-bs-toggle="tooltip" data-bs-title="{% if transaction.description %}{{ transaction.description }}{% else %}{% trans 'Expense' %}{% endif %}"></i>
+                <i class="fa-regular fa-circle tw:text-red-300" data-bs-toggle="tooltip" data-bs-title="{% if transaction.description %}{{ transaction.description }}{% else %}{% trans 'Expense' %}{% endif %}"></i>
               {% endif %}
             {% endif %}
           {% endfor %}
         </div>
       </div>
       {% else %}
-        <div class="!tw-hidden lg:!tw-block card h-100 rounded-0"></div>
+        <div class="tw:hidden! tw:lg:block! card h-100 rounded-0"></div>
       {% endif %}
     {% endfor %}
   </div>

app/templates/calendar_view/pages/calendar.html

@@ -17,7 +17,7 @@
     <div class="row mb-3 gx-xl-4 gy-3 mb-4">
       {#    Date picker#}
       <div class="col-12 col-xl-4 flex-row align-items-center d-flex">
-        <div class="tw-text-base h-100 align-items-center d-flex">
+        <div class="tw:text-base h-100 align-items-center d-flex">
           <a role="button"
              class="pe-4 py-2"
              hx-boost="true"
@@ -25,14 +25,14 @@
              href="{% url 'calendar' month=previous_month year=previous_year %}"><i
               class="fa-solid fa-chevron-left"></i></a>
         </div>
-        <div class="tw-text-3xl fw-bold font-monospace tw-w-full text-center"
+        <div class="tw:text-3xl fw-bold font-monospace tw:w-full text-center"
              hx-get="{% url 'month_year_picker' %}"
              hx-target="#generic-offcanvas-left"
              hx-trigger="click, date_picker from:window"
              hx-vals='{"month": {{ month }}, "year": {{ year }}, "for": "calendar", "field": "date"}' role="button">
           {{ month|month_name }} {{ year }}
         </div>
-        <div class="tw-text-base mx-2 h-100 align-items-center d-flex">
+        <div class="tw:text-base mx-2 h-100 align-items-center d-flex">
           <a role="button"
              class="ps-3 py-2"
              hx-boost="true"
@@ -52,7 +52,7 @@
     </div>
     <div class="row">
       <div class="show-loading" hx-get="{% url 'calendar_list' month=month year=year %}"
-           hx-trigger="load, updated from:window, selective_update from:window"></div>
+           hx-trigger="load, updated from:window, selective_update from:window, every 10m"></div>
     </div>
   </div>
   <c-ui.transactions_fab></c-ui.transactions_fab>

app/templates/categories/fragments/list.html

@@ -1,9 +1,9 @@
 {% load i18n %}
 <div class="container px-md-3 py-3 column-gap-5">
-  <div class="tw-text-3xl fw-bold font-monospace tw-w-full mb-3">
+  <div class="tw:text-3xl fw-bold font-monospace tw:w-full mb-3">
     {% spaceless %}
     <div>{% translate 'Categories' %}<span>
-      <a class="text-decoration-none tw-text-2xl p-1 category-action"
+      <a class="text-decoration-none tw:text-2xl p-1 category-action"
                 role="button"
                 data-bs-toggle="tooltip"
                 data-bs-title="{% translate "Add" %}"

app/templates/common/fragments/month_year_picker.html

@@ -32,7 +32,7 @@
        tabindex="0">
     <ul class="list-group list-group-flush" id="month-year-list">
       {% for month_data in x.list %}
-      <li class="list-group-item hover:tw-bg-zinc-900
+      <li class="list-group-item tw:hover:bg-zinc-900
             {% if month_data.month == current_month and month_data.year == current_year %} disabled bg-primary{% endif %}"
           {% if month_data.month == current_month and month_data.year == current_year %}aria-disabled="true"{% endif %}>
         <div class="d-flex justify-content-between">

app/templates/cotton/amount/display.html

@@ -3,10 +3,10 @@
 {% if not divless %}
 <div class="{% if text_end %}text-end{% elif text_start %}text-start{% endif %}">
 {% endif %}
-  <span class="amount{% if color == 'grey' or color == "gray" %} tw-text-gray-500{% elif color == 'green' %} tw-text-green-400{% elif color == 'red' %} tw-text-red-400{% endif %} {{ custom_class }}"
+  <span class="amount{% if color == 'grey' or color == "gray" %} tw:text-gray-500{% elif color == 'green' %} tw:text-green-400{% elif color == 'red' %} tw:text-red-400{% endif %} {{ custom_class }}"
        data-original-value="{% currency_display amount=amount prefix=prefix suffix=suffix decimal_places=decimal_places %}"
        data-amount="{{ amount|floatformat:"-40u" }}">
   </span><span>{{ slot }}</span>
 {% if not divless %}
 </div>
-{% endif %}
+{% endif %}

app/templates/cotton/components/fab.html

@@ -1,33 +1,33 @@
-<div class="tw-min-h-16">
+<div class="tw:min-h-16">
 <div
     id="fab-wrapper"
-    class="tw-fixed tw-bottom-5 tw-right-5 tw-ml-auto tw-w-max tw-flex tw-flex-col tw-items-end mt-5">
+    class="tw:fixed tw:bottom-5 tw:right-5 tw:ml-auto tw:w-max tw:flex tw:flex-col tw:items-end mt-5">
   <div
       id="menu"
-      class="tw-flex tw-flex-col tw-items-end tw-space-y-6 tw-transition-all tw-duration-300 tw-ease-in-out tw-opacity-0 tw-invisible tw-hidden tw-mb-2">
+      class="tw:flex tw:flex-col tw:items-end tw:space-y-6 tw:transition-all tw:duration-300 tw:ease-in-out tw:opacity-0 tw:invisible tw:hidden tw:mb-2">
 
     {{ slot }}
   </div>
 
   <button
-      class="btn btn-primary rounded-circle p-0 tw-w-12 tw-h-12 tw-flex tw-items-center tw-justify-center tw-shadow-lg hover:tw-shadow-xl focus:tw-shadow-xl tw-transition-all tw-duration-300 tw-ease-in-out"
+      class="btn btn-primary rounded-circle p-0 tw:w-12 tw:h-12 tw:flex tw:items-center tw:justify-center tw:shadow-lg tw:hover:shadow-xl tw:focus:shadow-xl tw:transition-all tw:duration-300 tw:ease-in-out"
       _="
           on click or focusout
-             if #menu matches .tw-invisible and event.type === 'click'
-               add .tw-rotate-45 to #fab-icon
-               remove .tw-invisible from #menu
-               remove .tw-hidden from #menu
-               remove .tw-opacity-0 from #menu
+             if #menu.classList.contains('tw:invisible') and event.type === 'click'
+               add .{'tw:rotate-45'} to #fab-icon
+               remove .{'tw:invisible'} from #menu
+               remove .{'tw:hidden'} from #menu
+               remove .{'tw:opacity-0'} from #menu
              else
                wait 0.2s
-               remove .tw-rotate-45 from #fab-icon
-               add .tw-invisible to #menu
-               add .tw-hidden to #menu
-               add .tw-opacity-0 to #menu
+               remove .{'tw:rotate-45'} from #fab-icon
+               add .{'tw:invisible'} to #menu
+               add .{'tw:hidden'} to #menu
+               add .{'tw:opacity-0'} to #menu
              end
           "
   >
-    <i id="fab-icon" class="fa-solid fa-plus tw-text-3xl tw-transition-transform tw-duration-300 tw-ease-in-out"></i>
+    <i id="fab-icon" class="fa-solid fa-plus tw:text-3xl tw:transition-transform tw:duration-300 tw:ease-in-out"></i>
   </button>
 </div>
 </div>

app/templates/cotton/components/fab_menu_button.html

@@ -1,5 +1,5 @@
 {% load i18n %}
-<div class="tw-relative fab-item">
+<div class="tw:relative fab-item">
   <button class="btn btn-sm btn-{{ color }}"
           hx-get="{{ url }}"
           hx-trigger="{{ hx_trigger }}"

app/templates/cotton/msg/empty.html

@@ -1,9 +1,9 @@
 <div class="row {% if not remove_padding %}p-5{% endif %}">
   <div class="col {% if not remove_padding %}p-5{% endif %}">
     <div class="text-center">
-      <i class="{% if icon %}{{ icon }}{% else %}fa-solid fa-circle-xmark{% endif %} tw-text-6xl"></i>
+      <i class="{% if icon %}{{ icon }}{% else %}fa-solid fa-circle-xmark{% endif %} tw:text-6xl"></i>
       <p class="lead mt-4 mb-0">{{ title }}</p>
-      <p class="tw-text-gray-500">{{ subtitle }}</p>
+      <p class="tw:text-gray-500">{{ subtitle }}</p>
     </div>
   </div>
 </div>

app/templates/cotton/transaction/item.html

@@ -8,16 +8,17 @@
                id="check-{{ transaction.id }}" aria-label="{% translate 'Select' %}" hx-preserve>
       </label>
     {% endif %}
-    <div class="tw-border-s-6 tw-border-e-0 tw-border-t-0 tw-border-b-0 border-bottom
-  hover:tw-bg-zinc-900 p-2 {% if transaction.account.is_asset %}tw-border-dashed{% else %}tw-border-solid{% endif %}
-  {% if transaction.type == "EX" %}tw-border-red-500{% else %}tw-border-green-500{% endif %} tw-relative
+    <div class="tw:border-s-4 tw:border-e-0 tw:border-t-0 tw:border-b-0 border-bottom
+  tw:hover:bg-zinc-900 p-2 {% if transaction.account.is_asset %}tw:border-dashed{% else %}tw:border-solid{% endif %}
+  {% if transaction.type == "EX" %}tw:border-red-500{% else %}tw:border-green-500{% endif %} tw:relative
   w-100 transaction-item"
-         _="on mouseover remove .tw-invisible from the first .transaction-actions in me end
-        on mouseout add .tw-invisible to the first .transaction-actions in me end">
-      <div class="row font-monospace tw-text-sm align-items-center">
-        <div class="col-lg-auto col-12 d-flex align-items-center tw-text-2xl lg:tw-text-xl text-lg-center text-center p-0 ps-1">
+         _="on mouseover remove .{'tw:invisible'} from the first .transaction-actions in me end
+        on mouseout add .{'tw:invisible'} to the first .transaction-actions in me end">
+      <div class="row font-monospace tw:text-sm align-items-center">
+        <div
+            class="col-lg-auto col-12 d-flex align-items-center tw:text-2xl tw:lg:text-xl text-lg-center text-center p-0 ps-1">
           {% if not transaction.deleted %}
-            <a class="text-decoration-none p-3 tw-text-gray-500"
+            <a class="text-decoration-none p-3 tw:text-gray-500!"
                title="{% if transaction.is_paid %}{% trans 'Paid' %}{% else %}{% trans 'Projected' %}{% endif %}"
                role="button"
                hx-get="{% url 'transaction_pay' transaction_id=transaction.id %}"
@@ -27,7 +28,7 @@
                   class="fa-regular fa-circle"></i>{% endif %}
             </a>
           {% else %}
-            <div class="text-decoration-none p-3 tw-text-gray-500"
+            <div class="text-decoration-none p-3 tw:text-gray-500!"
                  title="{% if transaction.is_paid %}{% trans 'Paid' %}{% else %}{% trans 'Projected' %}{% endif %}">
               {% if transaction.is_paid %}<i class="fa-regular fa-circle-check"></i>{% else %}<i
                   class="fa-regular fa-circle"></i>{% endif %}
@@ -36,13 +37,13 @@
         </div>
         <div class="col-lg col-12">
           {#      Date#}
-          <div class="row mb-2 mb-lg-1 tw-text-gray-400">
+          <div class="row mb-2 mb-lg-1 tw:text-gray-400">
             <div class="col-auto pe-1"><i class="fa-solid fa-calendar fa-fw me-1 fa-xs"></i></div>
             <div
                 class="col ps-0">{{ transaction.date|date:"SHORT_DATE_FORMAT" }} • {{ transaction.reference_date|date:"b/Y" }}</div>
           </div>
           {#      Description#}
-          <div class="mb-2 mb-lg-1 text-white tw-text-base">
+          <div class="mb-2 mb-lg-1 text-body tw:text-base">
             {% spaceless %}
               <span class="{% if transaction.description %}me-2{% endif %}">{{ transaction.description }}</span>
               {% if transaction.installment_plan and transaction.installment_id %}
@@ -50,18 +51,18 @@
                     class="badge text-bg-secondary">{{ transaction.installment_id }}/{{ transaction.installment_plan.installment_total_number }}</span>
               {% endif %}
               {% if transaction.recurring_transaction %}
-                <span class="text-primary tw-text-xs"><i class="fa-solid fa-arrows-rotate fa-fw"></i></span>
+                <span class="text-primary tw:text-xs"><i class="fa-solid fa-arrows-rotate fa-fw"></i></span>
               {% endif %}
               {% if transaction.dca_expense_entries.all or transaction.dca_income_entries.all %}
                 <span class="badge text-bg-secondary">{% trans 'DCA' %}</span>
               {% endif %}
             {% endspaceless %}
           </div>
-          <div class="tw-text-gray-400 tw-text-sm">
+          <div class="tw:text-gray-400 tw:text-sm">
             {#        Entities #}
             {% with transaction.entities.all as entities %}
               {% if entities %}
-                <div class="row mb-2 mb-lg-1 tw-text-gray-400">
+                <div class="row mb-2 mb-lg-1 tw:text-gray-400">
                   <div class="col-auto pe-1"><i class="fa-solid fa-user-group fa-fw me-1 fa-xs"></i></div>
                   <div class="col ps-0">{{ entities|join:", " }}</div>
                 </div>
@@ -69,14 +70,14 @@
             {% endwith %}
             {#        Notes#}
             {% if transaction.notes %}
-              <div class="row mb-2 mb-lg-1 tw-text-gray-400">
+              <div class="row mb-2 mb-lg-1 tw:text-gray-400">
                 <div class="col-auto pe-1"><i class="fa-solid fa-align-left fa-fw me-1 fa-xs"></i></div>
                 <div class="col ps-0">{{ transaction.notes | limited_markdown | linebreaksbr }}</div>
               </div>
             {% endif %}
             {#        Category#}
             {% if transaction.category %}
-              <div class="row mb-2 mb-lg-1 tw-text-gray-400">
+              <div class="row mb-2 mb-lg-1 tw:text-gray-400">
                 <div class="col-auto pe-1"><i class="fa-solid fa-icons fa-fw me-1 fa-xs"></i></div>
                 <div class="col ps-0">{{ transaction.category.name }}</div>
               </div>
@@ -84,7 +85,7 @@
             {#        Tags#}
             {% with transaction.tags.all as tags %}
               {% if tags %}
-                <div class="row mb-2 mb-lg-1 tw-text-gray-400">
+                <div class="row mb-2 mb-lg-1 tw:text-gray-400">
                   <div class="col-auto pe-1"><i class="fa-solid fa-hashtag fa-fw me-1 fa-xs"></i></div>
                   <div class="col ps-0">{{ tags|join:", " }}</div>
                 </div>
@@ -121,7 +122,7 @@
         <div>
           {#      Item actions#}
           <div
-              class="transaction-actions !tw-absolute tw-left-1/2 tw-top-0 tw--translate-x-1/2 tw--translate-y-1/2 tw-invisible d-flex flex-row card">
+              class="transaction-actions tw:absolute! tw:left-1/2 tw:top-0 tw:-translate-x-1/2 tw:-translate-y-1/2 tw:invisible d-flex flex-row card">
             <div class="card-body p-1 shadow-lg">
               {% if not transaction.deleted %}
                 <a class="btn btn-secondary btn-sm transaction-action"

app/templates/cotton/transaction/small_item.html

@@ -1,9 +1,9 @@
 <div class="card mb-2 transaction-item">
-    <div class="card-body p-2 tw-flex tw-items-center tw-gap-3" data-bs-toggle="collapse" data-bs-target="#{{ transaction.id }}" role="button" aria-expanded="false" aria-controls="{{ transaction.id }}">
+    <div class="card-body p-2 tw:flex tw:items-center tw:gap-3" data-bs-toggle="collapse" data-bs-target="#{{ transaction.id }}" role="button" aria-expanded="false" aria-controls="{{ transaction.id }}">
         <!-- Main visible content -->
-        <div class="tw-flex flex-lg-row flex-column lg:tw-items-center tw-w-full tw-gap-3">
+        <div class="tw:flex flex-lg-row flex-column tw:lg:items-center tw:w-full tw:gap-3">
             <!-- Type indicator -->
-            <div class="tw-w-8">
+            <div class="tw:w-8">
                 {% if transaction.type == 'IN' %}
                     <span class="badge bg-success">↑</span>
                 {% else %}
@@ -12,7 +12,7 @@
             </div>
 
             <!-- Payment status -->
-            <div class="tw-w-8">
+            <div class="tw:w-8">
                 {% if transaction.is_paid %}
                     <span class="badge bg-success">✓</span>
                 {% else %}
@@ -21,13 +21,13 @@
             </div>
 
             <!-- Description -->
-            <div class="tw-flex-grow">
-                <span class="tw-font-medium">{{ transaction.description }}</span>
+            <div class="tw:flex-grow">
+                <span class="tw:font-medium">{{ transaction.description }}</span>
             </div>
 
             <!-- Amount -->
-            <div class="tw-text-right tw-whitespace-nowrap">
-                <span class="{% if transaction.type == 'IN' %}tw-text-green-400{% else %}tw-text-red-400{% endif %}">
+            <div class="tw:text-right tw:whitespace-nowrap">
+                <span class="{% if transaction.type == 'IN' %}tw:text-green-400{% else %}tw:text-red-400{% endif %}">
                     {{ transaction.amount }}
                 </span>
                 {% if transaction.exchanged_amount %}
@@ -91,4 +91,4 @@
         </div>
     </div>
     </div>
-</div>
+</div>

app/templates/cotton/ui/account_card.html

@@ -3,7 +3,7 @@
 <div class="col card shadow">
   <div class="card-body">
     {% if account.account.group %}
-      <div class="tw-text-sm mb-2">
+      <div class="tw:text-sm mb-2">
         <span class="badge text-bg-primary ">{{ account.account.group }}</span>
       </div>
     {% endif %}
@@ -12,11 +12,11 @@
     </h5>
     <div class="d-flex justify-content-between align-items-baseline mt-2">
       <div class="text-end font-monospace">
-        <div class="tw-text-gray-400">{% translate 'projected income' %}</div>
+        <div class="tw:text-gray-400">{% translate 'projected income' %}</div>
       </div>
       <div class="dotted-line flex-grow-1"></div>
       {% if account.income_projected != 0 %}
-      <div class="text-end font-monospace tw-text-green-400">
+      <div class="text-end font-monospace tw:text-green-400">
         <c-amount.display
             :amount="account.income_projected"
             :prefix="account.currency.prefix"
@@ -28,7 +28,7 @@
       {% endif %}
     </div>
     {% if account.exchanged and account.exchanged.income_projected %}
-      <div class="text-end font-monospace tw-text-gray-500">
+      <div class="text-end font-monospace tw:text-gray-500">
         <c-amount.display
             :amount="account.exchanged.income_projected"
             :prefix="account.exchanged.currency.prefix"
@@ -38,12 +38,12 @@
     {% endif %}
     <div class="d-flex justify-content-between align-items-baseline mt-2">
       <div class="text-end font-monospace">
-        <div class="tw-text-gray-400">{% translate 'projected expenses' %}</div>
+        <div class="tw:text-gray-400">{% translate 'projected expenses' %}</div>
       </div>
       <div class="dotted-line flex-grow-1"></div>
       <div>
         {% if account.expense_projected != 0 %}
-        <div class="text-end font-monospace tw-text-red-400">
+        <div class="text-end font-monospace tw:text-red-400">
           <c-amount.display
               :amount="account.expense_projected"
               :prefix="account.currency.prefix"
@@ -56,7 +56,7 @@
       </div>
     </div>
     {% if account.exchanged and account.exchanged.expense_projected %}
-      <div class="text-end font-monospace tw-text-gray-500">
+      <div class="text-end font-monospace tw:text-gray-500">
         <c-amount.display
             :amount="account.exchanged.expense_projected"
             :prefix="account.exchanged.currency.prefix"
@@ -66,7 +66,7 @@
     {% endif %}
     <div class="d-flex justify-content-between align-items-baseline mt-2">
       <div class="text-end font-monospace">
-        <div class="tw-text-gray-400">{% translate 'projected total' %}</div>
+        <div class="tw:text-gray-400">{% translate 'projected total' %}</div>
       </div>
       <div class="dotted-line flex-grow-1"></div>
       <div
@@ -80,7 +80,7 @@
       </div>
     </div>
     {% if account.exchanged.total_projected and account.exchanged.total_projected %}
-      <div class="text-end font-monospace tw-text-gray-500">
+      <div class="text-end font-monospace tw:text-gray-500">
         <c-amount.display
             :amount="account.exchanged.total_projected"
             :prefix="account.exchanged.currency.prefix"
@@ -91,11 +91,11 @@
     <hr class="my-3">
     <div class="d-flex justify-content-between align-items-baseline mt-2">
       <div class="text-end font-monospace">
-        <div class="tw-text-gray-400">{% translate 'current income' %}</div>
+        <div class="tw:text-gray-400">{% translate 'current income' %}</div>
       </div>
       <div class="dotted-line flex-grow-1"></div>
       {% if account.income_current != 0 %}
-      <div class="text-end font-monospace tw-text-green-400">
+      <div class="text-end font-monospace tw:text-green-400">
         <c-amount.display
             :amount="account.income_current"
             :prefix="account.currency.prefix"
@@ -107,7 +107,7 @@
       {% endif %}
     </div>
     {% if account.exchanged and account.exchanged.income_current %}
-      <div class="text-end font-monospace tw-text-gray-500">
+      <div class="text-end font-monospace tw:text-gray-500">
         <c-amount.display
             :amount="account.exchanged.income_current"
             :prefix="account.exchanged.currency.prefix"
@@ -117,11 +117,11 @@
     {% endif %}
     <div class="d-flex justify-content-between align-items-baseline mt-2">
       <div class="text-end font-monospace">
-        <div class="tw-text-gray-400">{% translate 'current expenses' %}</div>
+        <div class="tw:text-gray-400">{% translate 'current expenses' %}</div>
       </div>
       <div class="dotted-line flex-grow-1"></div>
       {% if account.expense_current != 0 %}
-      <div class="text-end font-monospace tw-text-red-400">
+      <div class="text-end font-monospace tw:text-red-400">
         <c-amount.display
             :amount="account.expense_current"
             :prefix="account.currency.prefix"
@@ -133,7 +133,7 @@
       {% endif %}
     </div>
     {% if account.exchanged and account.exchanged.expense_current %}
-      <div class="text-end font-monospace tw-text-gray-500">
+      <div class="text-end font-monospace tw:text-gray-500">
         <c-amount.display
             :amount="account.exchanged.expense_current"
             :prefix="account.exchanged.currency.prefix"
@@ -143,7 +143,7 @@
     {% endif %}
     <div class="d-flex justify-content-between align-items-baseline mt-2">
       <div class="text-end font-monospace">
-        <div class="tw-text-gray-400">{% translate 'current total' %}</div>
+        <div class="tw:text-gray-400">{% translate 'current total' %}</div>
       </div>
       <div class="dotted-line flex-grow-1"></div>
       <div class="text-end font-monospace">
@@ -156,7 +156,7 @@
       </div>
     </div>
     {% if account.exchanged and account.exchanged.total_current %}
-      <div class="text-end font-monospace tw-text-gray-500">
+      <div class="text-end font-monospace tw:text-gray-500">
         <c-amount.display
             :amount="account.exchanged.total_current"
             :prefix="account.exchanged.currency.prefix"
@@ -168,7 +168,7 @@
       <hr class="my-3">
       <div class="d-flex justify-content-between align-items-baseline mt-2">
         <div class="text-end font-monospace">
-          <div class="tw-text-gray-400">{% translate 'final total' %}</div>
+          <div class="tw:text-gray-400">{% translate 'final total' %}</div>
         </div>
         <div class="dotted-line flex-grow-1"></div>
         <div class="text-end font-monospace">
@@ -181,7 +181,7 @@
         </div>
       </div>
       {% if account.exchanged and account.exchanged.total_final %}
-        <div class="text-end font-monospace tw-text-gray-500">
+        <div class="text-end font-monospace tw:text-gray-500">
           <c-amount.display
               :amount="account.exchanged.total_final"
               :prefix="account.exchanged.currency.prefix"

app/templates/cotton/ui/card.html

@@ -1,5 +1,5 @@
-<div class="card tw-relative h-100 shadow">
+<div class="card tw:relative h-100 shadow">
   <div class="card-body">
     {{ slot }}
   </div>
-</div>
+</div>

app/templates/cotton/ui/currency_card.html

@@ -7,11 +7,11 @@
     </h5>
     <div class="d-flex justify-content-between align-items-baseline mt-2">
       <div class="text-end font-monospace">
-        <div class="tw-text-gray-400">{% translate 'projected income' %}</div>
+        <div class="tw:text-gray-400">{% translate 'projected income' %}</div>
       </div>
       <div class="dotted-line flex-grow-1"></div>
       {% if currency.income_projected != 0 %}
-      <div class="text-end font-monospace tw-text-green-400">
+      <div class="text-end font-monospace tw:text-green-400">
         <c-amount.display
             :amount="currency.income_projected"
             :prefix="currency.currency.prefix"
@@ -23,7 +23,7 @@
       {% endif %}
     </div>
     {% if currency.exchanged and currency.exchanged.income_projected %}
-      <div class="text-end font-monospace tw-text-gray-500">
+      <div class="text-end font-monospace tw:text-gray-500">
         <c-amount.display
             :amount="currency.exchanged.income_projected"
             :prefix="currency.exchanged.currency.prefix"
@@ -33,12 +33,12 @@
     {% endif %}
     <div class="d-flex justify-content-between align-items-baseline mt-2">
       <div class="text-end font-monospace">
-        <div class="tw-text-gray-400">{% translate 'projected expenses' %}</div>
+        <div class="tw:text-gray-400">{% translate 'projected expenses' %}</div>
       </div>
       <div class="dotted-line flex-grow-1"></div>
       <div>
         {% if currency.expense_projected != 0 %}
-        <div class="text-end font-monospace tw-text-red-400">
+        <div class="text-end font-monospace tw:text-red-400">
           <c-amount.display
               :amount="currency.expense_projected"
               :prefix="currency.currency.prefix"
@@ -51,7 +51,7 @@
       </div>
     </div>
     {% if currency.exchanged and currency.exchanged.expense_projected %}
-      <div class="text-end font-monospace tw-text-gray-500">
+      <div class="text-end font-monospace tw:text-gray-500">
         <c-amount.display
             :amount="currency.exchanged.expense_projected"
             :prefix="currency.exchanged.currency.prefix"
@@ -61,7 +61,7 @@
     {% endif %}
     <div class="d-flex justify-content-between align-items-baseline mt-2">
       <div class="text-end font-monospace">
-        <div class="tw-text-gray-400">{% translate 'projected total' %}</div>
+        <div class="tw:text-gray-400">{% translate 'projected total' %}</div>
       </div>
       <div class="dotted-line flex-grow-1"></div>
       <div class="text-end font-monospace">
@@ -74,7 +74,7 @@
       </div>
     </div>
     {% if currency.exchanged.total_projected and currency.exchanged.total_projected %}
-      <div class="text-end font-monospace tw-text-gray-500">
+      <div class="text-end font-monospace tw:text-gray-500">
         <c-amount.display
             :amount="currency.exchanged.total_projected"
             :prefix="currency.exchanged.currency.prefix"
@@ -85,11 +85,11 @@
     <hr class="my-3">
     <div class="d-flex justify-content-between align-items-baseline mt-2">
       <div class="text-end font-monospace">
-        <div class="tw-text-gray-400">{% translate 'current income' %}</div>
+        <div class="tw:text-gray-400">{% translate 'current income' %}</div>
       </div>
       <div class="dotted-line flex-grow-1"></div>
       {% if currency.income_current != 0 %}
-      <div class="text-end font-monospace tw-text-green-400">
+      <div class="text-end font-monospace tw:text-green-400">
         <c-amount.display
             :amount="currency.income_current"
             :prefix="currency.currency.prefix"
@@ -101,7 +101,7 @@
       {% endif %}
     </div>
     {% if currency.exchanged and currency.exchanged.income_current %}
-      <div class="text-end font-monospace tw-text-gray-500">
+      <div class="text-end font-monospace tw:text-gray-500">
         <c-amount.display
             :amount="currency.exchanged.income_current"
             :prefix="currency.exchanged.currency.prefix"
@@ -111,11 +111,11 @@
     {% endif %}
     <div class="d-flex justify-content-between align-items-baseline mt-2">
       <div class="text-end font-monospace">
-        <div class="tw-text-gray-400">{% translate 'current expenses' %}</div>
+        <div class="tw:text-gray-400">{% translate 'current expenses' %}</div>
       </div>
       <div class="dotted-line flex-grow-1"></div>
       {% if currency.expense_current != 0 %}
-      <div class="text-end font-monospace tw-text-red-400">
+      <div class="text-end font-monospace tw:text-red-400">
         <c-amount.display
             :amount="currency.expense_current"
             :prefix="currency.currency.prefix"
@@ -127,7 +127,7 @@
       {% endif %}
     </div>
     {% if currency.exchanged and currency.exchanged.expense_current %}
-      <div class="text-end font-monospace tw-text-gray-500">
+      <div class="text-end font-monospace tw:text-gray-500">
         <c-amount.display
             :amount="currency.exchanged.expense_current"
             :prefix="currency.exchanged.currency.prefix"
@@ -137,7 +137,7 @@
     {% endif %}
     <div class="d-flex justify-content-between align-items-baseline mt-2">
       <div class="text-end font-monospace">
-        <div class="tw-text-gray-400">{% translate 'current total' %}</div>
+        <div class="tw:text-gray-400">{% translate 'current total' %}</div>
       </div>
       <div class="dotted-line flex-grow-1"></div>
       <div class="text-end font-monospace">
@@ -150,7 +150,7 @@
       </div>
     </div>
     {% if currency.exchanged and currency.exchanged.total_current %}
-      <div class="text-end font-monospace tw-text-gray-500">
+      <div class="text-end font-monospace tw:text-gray-500">
         <c-amount.display
             :amount="currency.exchanged.total_current"
             :prefix="currency.exchanged.currency.prefix"
@@ -162,7 +162,7 @@
       <hr class="my-3">
       <div class="d-flex justify-content-between align-items-baseline mt-2">
         <div class="text-end font-monospace">
-          <div class="tw-text-gray-400">{% translate 'final total' %}</div>
+          <div class="tw:text-gray-400">{% translate 'final total' %}</div>
         </div>
         <div class="dotted-line flex-grow-1"></div>
         <div class="text-end font-monospace">
@@ -175,7 +175,7 @@
         </div>
       </div>
       {% if currency.exchanged and currency.exchanged.total_final %}
-        <div class="text-end font-monospace tw-text-gray-500">
+        <div class="text-end font-monospace tw:text-gray-500">
           <c-amount.display
               :amount="currency.exchanged.total_final"
               :prefix="currency.exchanged.currency.prefix"

app/templates/cotton/ui/deleted_transactions_action_bar.html

@@ -1,16 +1,16 @@
 {% load i18n %}
-<div class="tw-sticky tw-bottom-4 tw-left-0 tw-right-0 tw-z-50 tw-hidden mx-auto tw-w-fit" id="actions-bar"
+<div class="tw:sticky tw:bottom-4 tw:left-0 tw:right-0 tw:z-50 tw:hidden mx-auto tw:w-fit" id="actions-bar"
      _="on change from #transactions-list or htmx:afterSettle from window
         if #actions-bar then
             if no <input[type='checkbox']:checked/> in #transactions-list
               if #actions-bar
                 add .slide-in-bottom-reverse then settle
-                then add .tw-hidden to #actions-bar
+                then add .tw:hidden to #actions-bar
                 then remove .slide-in-bottom-reverse
               end
             else
               if #actions-bar
-                remove .tw-hidden from #actions-bar
+                remove .tw:hidden from #actions-bar
                 then trigger selected_transactions_updated
               end
             end
@@ -26,20 +26,20 @@
           </button>
           <ul class="dropdown-menu">
             <li>
-              <div class="dropdown-item px-3 tw-cursor-pointer"
+              <div class="dropdown-item px-3 tw:cursor-pointer"
                    _="on click set <#transactions-list input[type='checkbox']/>'s checked to true then call me.blur() then trigger change">
-                <i class="fa-regular fa-square-check tw-text-green-400 me-3"></i>{% translate 'Select All' %}
+                <i class="fa-regular fa-square-check tw:text-green-400 me-3"></i>{% translate 'Select All' %}
               </div>
             </li>
             <li>
-              <div class="dropdown-item px-3 tw-cursor-pointer"
+              <div class="dropdown-item px-3 tw:cursor-pointer"
                    _="on click set <#transactions-list input[type='checkbox']/>'s checked to false then call me.blur() then trigger change">
-                <i class="fa-regular fa-square tw-text-red-400 me-3"></i>{% translate 'Unselect All' %}
+                <i class="fa-regular fa-square tw:text-red-400 me-3"></i>{% translate 'Unselect All' %}
               </div>
             </li>
           </ul>
         </div>
-        <div class="vr tw-align-middle"></div>
+        <div class="vr tw:align-middle"></div>
         <button class="btn btn-secondary btn-sm"
                 hx-get="{% url 'transactions_bulk_undelete' %}"
                 hx-include=".transaction"
@@ -60,7 +60,7 @@
                 _="install prompt_swal">
           <i class="fa-solid fa-trash text-danger"></i>
         </button>
-        <div class="vr tw-align-middle"></div>
+        <div class="vr tw:align-middle"></div>
         <div class="btn-group"
              _="on selected_transactions_updated from #actions-bar
                   set realTotal to math.bignumber(0)
@@ -118,10 +118,10 @@
             <li>
               <div class="dropdown-item-text p-0">
                 <div>
-                  <div class="text-body-secondary tw-text-xs tw-font-medium px-3">
+                  <div class="text-body-secondary tw:text-xs tw:font-medium px-3">
                     {% trans "Flat Total" %}
                   </div>
-                  <div class="dropdown-item px-3 tw-cursor-pointer"
+                  <div class="dropdown-item px-3 tw:cursor-pointer"
                        id="calc-menu-flat-total"
                        _="on click
                             set original_value to my innerText
@@ -138,10 +138,10 @@
             <li>
               <div class="dropdown-item-text p-0">
                 <div>
-                  <div class="text-body-secondary tw-text-xs tw-font-medium px-3">
+                  <div class="text-body-secondary tw:text-xs tw:font-medium px-3">
                     {% trans "Real Total" %}
                   </div>
-                  <div class="dropdown-item px-3 tw-cursor-pointer"
+                  <div class="dropdown-item px-3 tw:cursor-pointer"
                        id="calc-menu-real-total"
                        _="on click
                             set original_value to my innerText
@@ -158,10 +158,10 @@
             <li>
               <div class="dropdown-item-text p-0">
                 <div>
-                  <div class="text-body-secondary tw-text-xs tw-font-medium px-3">
+                  <div class="text-body-secondary tw:text-xs tw:font-medium px-3">
                     {% trans "Mean" %}
                   </div>
-                  <div class="dropdown-item px-3 tw-cursor-pointer"
+                  <div class="dropdown-item px-3 tw:cursor-pointer"
                        id="calc-menu-mean"
                        _="on click
                             set original_value to my innerText
@@ -178,10 +178,10 @@
             <li>
               <div class="dropdown-item-text p-0">
                 <div>
-                  <div class="text-body-secondary tw-text-xs tw-font-medium px-3">
+                  <div class="text-body-secondary tw:text-xs tw:font-medium px-3">
                     {% trans "Max" %}
                   </div>
-                  <div class="dropdown-item px-3 tw-cursor-pointer"
+                  <div class="dropdown-item px-3 tw:cursor-pointer"
                        id="calc-menu-max"
                        _="on click
                             set original_value to my innerText
@@ -198,10 +198,10 @@
             <li>
               <div class="dropdown-item-text p-0">
                 <div>
-                  <div class="text-body-secondary tw-text-xs tw-font-medium px-3">
+                  <div class="text-body-secondary tw:text-xs tw:font-medium px-3">
                     {% trans "Min" %}
                   </div>
-                  <div class="dropdown-item px-3 tw-cursor-pointer"
+                  <div class="dropdown-item px-3 tw:cursor-pointer"
                        id="calc-menu-min"
                        _="on click
                             set original_value to my innerText
@@ -218,10 +218,10 @@
             <li>
               <div class="dropdown-item-text p-0">
                 <div>
-                  <div class="text-body-secondary tw-text-xs tw-font-medium px-3">
+                  <div class="text-body-secondary tw:text-xs tw:font-medium px-3">
                     {% trans "Count" %}
                   </div>
-                  <div class="dropdown-item px-3 tw-cursor-pointer"
+                  <div class="dropdown-item px-3 tw:cursor-pointer"
                        id="calc-menu-count"
                        _="on click
                             set original_value to my innerText

app/templates/cotton/ui/help_icon.html

@@ -1,6 +1,6 @@
 {% spaceless %}
 {% load i18n %}
-<span class="tw-text-xs text-white-50 mx-1"
+<span class="tw:text-xs text-white-50 mx-1"
       data-bs-toggle="tooltip"
       data-bs-title="{{ content }}">
   <i class="{% if not icon %}fa-solid fa-circle-question{% else %}{{ icon }}{% endif %} fa-fw"></i>

app/templates/cotton/ui/info_card.html

@@ -1,9 +1,9 @@
-<div class="card tw-relative h-100 shadow">
-  <div class="tw-absolute tw-h-8 tw-w-8 tw-right-2 tw-top-2 tw-bg-{{ color }}-300 tw-text-{{ color }}-800 text-center align-items-center d-flex justify-content-center rounded-2">
+<div class="card tw:relative h-100 shadow">
+  <div class="tw:absolute tw:h-8 tw:w-8 tw:right-2 tw:top-2 tw:bg-{{ color }}-300 tw:text-{{ color }}-800 text-center align-items-center d-flex justify-content-center rounded-2">
     {% if icon %}<i class="{{ icon }}"></i>{% else %}<span class="fw-bold">{{ title.0 }}</span>{% endif %}
   </div>
   <div class="card-body">
-    <h5 class="tw-text-{{ color }}-400 fw-bold tw-mr-[50px]" {{ attrs }}>{{ title }}{% if help_text %}<c-ui.help-icon :content="help_text" icon=""></c-ui.help-icon>{% endif %}</h5>
+    <h5 class="tw:text-{{ color }}-400 fw-bold tw:mr-[50px]" {{ attrs }}>{{ title }}{% if help_text %}<c-ui.help-icon :content="help_text" icon=""></c-ui.help-icon>{% endif %}</h5>
     {{ slot }}
   </div>
 </div>

app/templates/cotton/ui/percentage_distribution.html

@@ -1,28 +1,28 @@
 {% load i18n %}
 <div class="progress-stacked">
   <div class="progress position-relative" role="progressbar" aria-label="{% trans 'Projected Income' %} ({{ percentage.percentages.income_projected|floatformat:2 }}%)" aria-valuenow="{{ percentage.percentages.expense_projected|floatformat:0 }}" aria-valuemin="0" aria-valuemax="100" style="width: {{ percentage.percentages.income_projected|floatformat:"2u" }}%">
-    <div class="progress-bar progress-bar-striped !tw-bg-green-300"
+    <div class="progress-bar progress-bar-striped tw:bg-green-300!"
          data-bs-toggle="tooltip"
          data-bs-placement="top"
          title="{% trans 'Projected Income' %} ({{ percentage.percentages.income_projected|floatformat:2 }}%)">
     </div>
   </div>
   <div class="progress position-relative" role="progressbar" aria-label="{% trans 'Current Income' %} ({{ percentage.percentages.income_current|floatformat:2 }}%)" aria-valuenow="{{ percentage.percentages.expense_projected|floatformat:0 }}" aria-valuemin="0" aria-valuemax="100" style="width: {{ percentage.percentages.income_current|floatformat:"2u" }}%">
-    <div class="progress-bar !tw-bg-green-400"
+    <div class="progress-bar tw:bg-green-400!"
          data-bs-toggle="tooltip"
          data-bs-placement="top"
          title="{% trans 'Current Income' %} ({{ p.percentages.income_current|floatformat:2 }}%)">
     </div>
   </div>
   <div class="progress position-relative" role="progressbar" aria-label="{% trans 'Projected Expenses' %} ({{ percentage.percentages.expense_projected|floatformat:2 }}%)" aria-valuenow="{{ percentage.percentages.expense_projected|floatformat:0 }}" aria-valuemin="0" aria-valuemax="100" style="width: {{ percentage.percentages.expense_projected|floatformat:"2u" }}%">
-    <div class="progress-bar progress-bar-striped !tw-bg-red-300"
+    <div class="progress-bar progress-bar-striped tw:bg-red-300!"
          data-bs-toggle="tooltip"
          data-bs-placement="top"
          title="{% trans 'Projected Expenses' %} ({{ percentage.percentages.expense_projected|floatformat:2 }}%)">
     </div>
   </div>
   <div class="progress position-relative" role="progressbar" aria-label="{% trans 'Current Expenses' %} ({{ percentage.percentages.expense_current|floatformat:2 }}%)" aria-valuenow="{{ percentage.percentages.expense_projected|floatformat:0 }}" aria-valuemin="0" aria-valuemax="100" style="width: {{ percentage.percentages.expense_current|floatformat:"2u" }}%">
-    <div class="progress-bar !tw-bg-red-400"
+    <div class="progress-bar tw:bg-red-400!"
          data-bs-toggle="tooltip"
          data-bs-placement="top"
          title="{% trans 'Current Expenses' %} ({{ percentage.percentages.expense_current|floatformat:2 }}%)">

app/templates/cotton/ui/transactions_action_bar.html

@@ -1,16 +1,16 @@
 {% load i18n %}
-<div class="tw-sticky tw-bottom-4 tw-left-0 tw-right-0 tw-z-50 tw-hidden mx-auto tw-w-fit" id="actions-bar"
+<div class="tw:sticky tw:bottom-4 tw:left-0 tw:right-0 tw:z-50 tw:hidden mx-auto tw:w-fit" id="actions-bar"
      _="on change from #transactions-list or htmx:afterSettle from window
         if #actions-bar then
             if no <input[type='checkbox']:checked/> in #transactions-list
               if #actions-bar
                 add .slide-in-bottom-reverse then settle
-                then add .tw-hidden to #actions-bar
+                then add .tw:hidden to #actions-bar
                 then remove .slide-in-bottom-reverse
               end
             else
               if #actions-bar
-                remove .tw-hidden from #actions-bar
+                remove .tw:hidden from #actions-bar
                 then trigger selected_transactions_updated
               end
             end
@@ -26,20 +26,20 @@
           </button>
           <ul class="dropdown-menu">
             <li>
-              <div class="dropdown-item px-3 tw-cursor-pointer"
+              <div class="dropdown-item px-3 tw:cursor-pointer"
                    _="on click set <#transactions-list .transaction:not([style*='display: none']) input[type='checkbox']/>'s checked to true then call me.blur() then trigger change">
-                <i class="fa-regular fa-square-check tw-text-green-400 me-3"></i>{% translate 'Select All' %}
+                <i class="fa-regular fa-square-check tw:text-green-400 me-3"></i>{% translate 'Select All' %}
               </div>
             </li>
             <li>
-              <div class="dropdown-item px-3 tw-cursor-pointer"
+              <div class="dropdown-item px-3 tw:cursor-pointer"
                    _="on click set <#transactions-list input[type='checkbox']/>'s checked to false then call me.blur() then trigger change">
-                <i class="fa-regular fa-square tw-text-red-400 me-3"></i>{% translate 'Unselect All' %}
+                <i class="fa-regular fa-square tw:text-red-400 me-3"></i>{% translate 'Unselect All' %}
               </div>
             </li>
           </ul>
         </div>
-        <div class="vr tw-align-middle"></div>
+        <div class="vr tw:align-middle"></div>
         <div class="btn-group">
           <button class="btn btn-secondary btn-sm"
                   hx-get="{% url 'transactions_bulk_edit' %}"
@@ -56,17 +56,17 @@
 
           <ul class="dropdown-menu">
             <li>
-              <div class="dropdown-item px-3 tw-cursor-pointer"
+              <div class="dropdown-item px-3 tw:cursor-pointer"
                    hx-get="{% url 'transactions_bulk_unpay' %}"
                    hx-include=".transaction">
-                <i class="fa-regular fa-circle tw-text-red-400 fa-fw me-3"></i>{% translate 'Mark as unpaid' %}
+                <i class="fa-regular fa-circle tw:text-red-400 fa-fw me-3"></i>{% translate 'Mark as unpaid' %}
               </div>
             </li>
             <li>
-              <div class="dropdown-item px-3 tw-cursor-pointer"
+              <div class="dropdown-item px-3 tw:cursor-pointer"
                    hx-get="{% url 'transactions_bulk_pay' %}"
                    hx-include=".transaction">
-                <i class="fa-regular fa-circle-check tw-text-green-400 fa-fw me-3"></i>{% translate 'Mark as paid' %}
+                <i class="fa-regular fa-circle-check tw:text-green-400 fa-fw me-3"></i>{% translate 'Mark as paid' %}
               </div>
             </li>
           </ul>
@@ -91,7 +91,7 @@
                 _="install prompt_swal">
           <i class="fa-solid fa-trash text-danger"></i>
         </button>
-        <div class="vr tw-align-middle"></div>
+        <div class="vr tw:align-middle"></div>
         <div class="btn-group"
              _="on selected_transactions_updated from #actions-bar
                   set realTotal to math.bignumber(0)
@@ -149,10 +149,10 @@
             <li>
               <div class="dropdown-item-text p-0">
                 <div>
-                  <div class="text-body-secondary tw-text-xs tw-font-medium px-3">
+                  <div class="text-body-secondary tw:text-xs tw:font-medium px-3">
                     {% trans "Flat Total" %}
                   </div>
-                  <div class="dropdown-item px-3 tw-cursor-pointer"
+                  <div class="dropdown-item px-3 tw:cursor-pointer"
                        id="calc-menu-flat-total"
                        _="on click
                             set original_value to my innerText
@@ -169,10 +169,10 @@
             <li>
               <div class="dropdown-item-text p-0">
                 <div>
-                  <div class="text-body-secondary tw-text-xs tw-font-medium px-3">
+                  <div class="text-body-secondary tw:text-xs tw:font-medium px-3">
                     {% trans "Real Total" %}
                   </div>
-                  <div class="dropdown-item px-3 tw-cursor-pointer"
+                  <div class="dropdown-item px-3 tw:cursor-pointer"
                        id="calc-menu-real-total"
                        _="on click
                             set original_value to my innerText
@@ -189,10 +189,10 @@
             <li>
               <div class="dropdown-item-text p-0">
                 <div>
-                  <div class="text-body-secondary tw-text-xs tw-font-medium px-3">
+                  <div class="text-body-secondary tw:text-xs tw:font-medium px-3">
                     {% trans "Mean" %}
                   </div>
-                  <div class="dropdown-item px-3 tw-cursor-pointer"
+                  <div class="dropdown-item px-3 tw:cursor-pointer"
                        id="calc-menu-mean"
                        _="on click
                             set original_value to my innerText
@@ -209,10 +209,10 @@
             <li>
               <div class="dropdown-item-text p-0">
                 <div>
-                  <div class="text-body-secondary tw-text-xs tw-font-medium px-3">
+                  <div class="text-body-secondary tw:text-xs tw:font-medium px-3">
                     {% trans "Max" %}
                   </div>
-                  <div class="dropdown-item px-3 tw-cursor-pointer"
+                  <div class="dropdown-item px-3 tw:cursor-pointer"
                        id="calc-menu-max"
                        _="on click
                             set original_value to my innerText
@@ -229,10 +229,10 @@
             <li>
               <div class="dropdown-item-text p-0">
                 <div>
-                  <div class="text-body-secondary tw-text-xs tw-font-medium px-3">
+                  <div class="text-body-secondary tw:text-xs tw:font-medium px-3">
                     {% trans "Min" %}
                   </div>
-                  <div class="dropdown-item px-3 tw-cursor-pointer"
+                  <div class="dropdown-item px-3 tw:cursor-pointer"
                        id="calc-menu-min"
                        _="on click
                             set original_value to my innerText
@@ -249,10 +249,10 @@
             <li>
               <div class="dropdown-item-text p-0">
                 <div>
-                  <div class="text-body-secondary tw-text-xs tw-font-medium px-3">
+                  <div class="text-body-secondary tw:text-xs tw:font-medium px-3">
                     {% trans "Count" %}
                   </div>
-                  <div class="dropdown-item px-3 tw-cursor-pointer"
+                  <div class="dropdown-item px-3 tw:cursor-pointer"
                        id="calc-menu-count"
                        _="on click
                             set original_value to my innerText

app/templates/cotton/ui/transactions_fab.html

@@ -50,4 +50,11 @@
             url="{% url 'account_reconciliation' %}"
             icon="fa-solid fa-scale-balanced"
             title="{% translate "Balance" %}"></c-components.fab_menu_button>
+    <c-components.fab_menu_button
+            color="secondary"
+            hx_target="#generic-offcanvas"
+            hx_trigger="click, quick_transaction from:window"
+            url="{% url 'quick_transactions_create_menu' %}"
+            icon="fa-solid fa-person-running"
+            title="{% translate "Quick Transaction" %}"></c-components.fab_menu_button>
 </c-components.fab>

app/templates/currencies/fragments/list.html

@@ -1,9 +1,9 @@
 {% load i18n %}
 <div class="container px-md-3 py-3 column-gap-5">
-  <div class="tw-text-3xl fw-bold font-monospace tw-w-full mb-3">
+  <div class="tw:text-3xl fw-bold font-monospace tw:w-full mb-3">
     {% spaceless %}
     <div>{% translate 'Currencies' %}<span>
-      <a class="text-decoration-none tw-text-2xl p-1 category-action"
+      <a class="text-decoration-none tw:text-2xl p-1 category-action"
                 role="button"
                 data-bs-toggle="tooltip"
                 data-bs-title="{% translate "Add" %}"

app/templates/dca/fragments/strategy/details.html

@@ -2,10 +2,10 @@
 {% load i18n %}
 <div class="container-fluid px-md-3 py-3 column-gap-5">
   <div class="d-lg-flex justify-content-between mb-3 w-100">
-    <div class="tw-text-3xl fw-bold font-monospace d-flex align-items-center">
+    <div class="tw:text-3xl fw-bold font-monospace d-flex align-items-center">
       {{ strategy.name }}
     </div>
-    <div class="tw-text-sm text-lg-end mt-2 mt-lg-0">
+    <div class="tw:text-sm text-lg-end mt-2 mt-lg-0">
       <div class="mb-2">
         <span class="badge rounded-pill text-bg-secondary">{{ strategy.payment_currency.name }}</span> x <span class="badge rounded-pill text-bg-secondary">{{ strategy.target_currency.name }}</span>
       </div>
@@ -19,7 +19,7 @@
            • {{ strategy.current_price.1|date:"SHORT_DATETIME_FORMAT" }}
           </c-amount.display>
           {% else %}
-          <div class="tw-text-red-400">{% trans "No exchange rate available" %}</div>
+          <div class="tw:text-red-400">{% trans "No exchange rate available" %}</div>
           {% endif %}
       </div>
     </div>
@@ -30,7 +30,7 @@
       <div class="card">
         <div class="card-body">
           {% spaceless %}
-            <div class="card-title tw-text-xl">{% trans "Entries" %}<span>
+            <div class="card-title tw:text-xl">{% trans "Entries" %}<span>
                 <a class="text-decoration-none p-1 category-action"
                    role="button"
                    data-bs-toggle="tooltip"
@@ -190,7 +190,7 @@
             <div class="card-body">
               <h5 class="card-title">{% trans "Total P/L" %}</h5>
               <div
-                  class="card-text {% if strategy.total_profit_loss >= 0 %}tw-text-green-400{% else %}tw-text-red-400{% endif %}">
+                  class="card-text {% if strategy.total_profit_loss >= 0 %}tw:text-green-400{% else %}tw:text-red-400{% endif %}">
                 <c-amount.display
                     :amount="strategy.total_profit_loss"
                     :prefix="strategy.payment_currency.prefix"
@@ -206,7 +206,7 @@
             <div class="card-body">
               <h5 class="card-title">{% trans "Total % P/L" %}</h5>
               <div
-                  class="card-text {% if strategy.total_profit_loss >= 0 %}tw-text-green-400{% else %}tw-text-red-400{% endif %}">
+                  class="card-text {% if strategy.total_profit_loss >= 0 %}tw:text-green-400{% else %}tw:text-red-400{% endif %}">
                 {{ strategy.total_profit_loss_percentage|floatformat:2 }}%
               </div>
             </div>
@@ -451,7 +451,7 @@
           <div class="card">
             <div class="card-body">
               <h5 class="card-title">{% trans "Investment Frequency" %}</h5>
-              <p class="card-text tw-text-gray-400">
+              <p class="card-text tw:text-gray-400">
                 {% trans "The straighter the blue line, the more consistent your DCA strategy is." %}
               </p>
               <canvas id="frequencyChart"></canvas>

app/templates/dca/fragments/strategy/list.html

@@ -1,9 +1,9 @@
 {% load i18n %}
 <div class="container px-md-3 py-3 column-gap-5">
-  <div class="tw-text-3xl fw-bold font-monospace tw-w-full mb-3">
+  <div class="tw:text-3xl fw-bold font-monospace tw:w-full mb-3">
     {% spaceless %}
       <div>{% translate 'Dollar Cost Average Strategies' %}<span>
-      <a class="text-decoration-none tw-text-2xl p-1 category-action"
+      <a class="text-decoration-none tw:text-2xl p-1 category-action"
          role="button"
          data-bs-toggle="tooltip"
          data-bs-title="{% translate "Add" %}"
@@ -25,12 +25,12 @@
           <a href="{% url 'dca_strategy_detail_index' strategy_id=strategy.id %}" hx-boost="true"
              class="text-decoration-none card-body">
             <div class="">
-              <div class="card-title tw-text-xl">{{ strategy.name }}</div>
-              <div class="card-text tw-text-gray-400">{{ strategy.notes }}</div>
+              <div class="card-title tw:text-xl">{{ strategy.name }}</div>
+              <div class="card-text tw:text-gray-400">{{ strategy.notes }}</div>
             </div>
           </a>
           <div class="card-footer text-end">
-            <a class="text-decoration-none tw-text-gray-400 p-1"
+            <a class="text-decoration-none tw:text-gray-400 p-1"
                role="button"
                data-bs-toggle="tooltip"
                data-bs-title="{% translate "Edit" %}"

app/templates/entities/fragments/list.html

@@ -1,9 +1,9 @@
 {% load i18n %}
 <div class="container px-md-3 py-3 column-gap-5">
-  <div class="tw-text-3xl fw-bold font-monospace tw-w-full mb-3">
+  <div class="tw:text-3xl fw-bold font-monospace tw:w-full mb-3">
     {% spaceless %}
     <div>{% translate 'Entities' %}<span>
-      <a class="text-decoration-none tw-text-2xl p-1 category-action"
+      <a class="text-decoration-none tw:text-2xl p-1 category-action"
                 role="button"
                 data-bs-toggle="tooltip"
                 data-bs-title="{% translate "Add" %}"

app/templates/exchange_rates/fragments/list.html

@@ -1,10 +1,10 @@
 {% load currency_display %}
 {% load i18n %}
 <div class="container px-md-3 py-3 column-gap-5">
-  <div class="tw-text-3xl fw-bold font-monospace tw-w-full mb-3">
+  <div class="tw:text-3xl fw-bold font-monospace tw:w-full mb-3">
     {% spaceless %}
       <div>{% translate 'Exchange Rates' %}<span>
-      <a class="text-decoration-none tw-text-2xl p-1 category-action"
+      <a class="text-decoration-none tw:text-2xl p-1 category-action"
          role="button"
          data-bs-toggle="tooltip"
          data-bs-title="{% translate "Add" %}"

app/templates/exchange_rates/fragments/table.html

@@ -58,7 +58,7 @@
     <nav aria-label="{% translate 'Page navigation' %}">
     <ul class="pagination justify-content-center mt-5">
       <li class="page-item">
-        <a class="page-link tw-cursor-pointer {% if not page_obj.has_previous %}disabled{% endif %}"
+        <a class="page-link tw:cursor-pointer {% if not page_obj.has_previous %}disabled{% endif %}"
            hx-get="{% if page_obj.has_previous %}{% url 'exchange_rates_list_pair' %}{% endif %}"
            hx-vals='{"page": 1, "from": "{{ from_currency|default_if_none:"" }}", "to": "{{ to_currency|default_if_none:"" }}"}'
            hx-include="#filter, #order"
@@ -79,13 +79,13 @@
               {% if page_number <= page_obj.number|add:3 and page_number >= page_obj.number|add:-3 %}
                   {% if page_obj.number == page_number %}
                       <li class="page-item active">
-                          <a class="page-link tw-cursor-pointer">
+                          <a class="page-link tw:cursor-pointer">
                               {{ page_number }}
                           </a>
                       </li>
                   {% else %}
                       <li class="page-item">
-                          <a class="page-link tw-cursor-pointer"
+                          <a class="page-link tw:cursor-pointer"
                              hx-get="{% url 'exchange_rates_list_pair' %}"
                              hx-vals='{"page": {{ page_number }}, "from": "{{ from_currency|default_if_none:"" }}", "to": "{{ to_currency|default_if_none:"" }}"}'
                              hx-target="#exchange-rates-table"
@@ -104,7 +104,7 @@
           </a>
         </li>
         <li class="page-item">
-          <a class="page-link tw-cursor-pointer"
+          <a class="page-link tw:cursor-pointer"
              hx-get="{% url 'exchange_rates_list_pair' %}" hx-target="#exchange-rates-table"
              hx-vals='{"page": {{ page_obj.paginator.num_pages }}, "from": "{{ from_currency|default_if_none:"" }}", "to": "{{ to_currency|default_if_none:"" }}"}'
              hx-include="#filter, #order"
@@ -115,7 +115,7 @@
         </li>
       {% endif %}
       <li class="page-item">
-        <a class="page-link {% if not page_obj.has_next %}disabled{% endif %} tw-cursor-pointer"
+        <a class="page-link {% if not page_obj.has_next %}disabled{% endif %} tw:cursor-pointer"
            hx-get="{% if page_obj.has_next %}{% url 'exchange_rates_list_pair' %}{% endif %}"
            hx-vals='{"page": {{ page_obj.paginator.num_pages }}, "from": "{{ from_currency|default_if_none:"" }}", "to": "{{ to_currency|default_if_none:"" }}"}'
            hx-include="#filter, #order"

app/templates/exchange_rates_services/fragments/list.html

@@ -1,10 +1,10 @@
 {% load currency_display %}
 {% load i18n %}
 <div class="container px-md-3 py-3 column-gap-5">
-  <div class="tw-text-3xl fw-bold font-monospace tw-w-full mb-3">
+  <div class="tw:text-3xl fw-bold font-monospace tw:w-full mb-3">
     {% spaceless %}
       <div>{% translate 'Automatic Exchange Rates' %}<span>
-      <a class="text-decoration-none tw-text-2xl p-1 category-action"
+      <a class="text-decoration-none tw:text-2xl p-1 category-action"
          role="button"
          data-bs-toggle="tooltip"
          data-bs-title="{% translate "Add" %}"

app/templates/exchange_rates_services/fragments/table.html

@@ -58,7 +58,7 @@
     <nav aria-label="{% translate 'Page navigation' %}">
     <ul class="pagination justify-content-center mt-5">
       <li class="page-item">
-        <a class="page-link tw-cursor-pointer {% if not page_obj.has_previous %}disabled{% endif %}"
+        <a class="page-link tw:cursor-pointer {% if not page_obj.has_previous %}disabled{% endif %}"
            hx-get="{% if page_obj.has_previous %}{% url 'exchange_rates_list_pair' %}{% endif %}"
            hx-vals='{"page": 1, "from": "{{ from_currency|default_if_none:"" }}", "to": "{{ to_currency|default_if_none:"" }}"}'
            hx-include="#filter, #order"
@@ -79,13 +79,13 @@
               {% if page_number <= page_obj.number|add:3 and page_number >= page_obj.number|add:-3 %}
                   {% if page_obj.number == page_number %}
                       <li class="page-item active">
-                          <a class="page-link tw-cursor-pointer">
+                          <a class="page-link tw:cursor-pointer">
                               {{ page_number }}
                           </a>
                       </li>
                   {% else %}
                       <li class="page-item">
-                          <a class="page-link tw-cursor-pointer"
+                          <a class="page-link tw:cursor-pointer"
                              hx-get="{% url 'exchange_rates_list_pair' %}"
                              hx-vals='{"page": {{ page_number }}, "from": "{{ from_currency|default_if_none:"" }}", "to": "{{ to_currency|default_if_none:"" }}"}'
                              hx-target="#exchange-rates-table"
@@ -104,7 +104,7 @@
           </a>
         </li>
         <li class="page-item">
-          <a class="page-link tw-cursor-pointer"
+          <a class="page-link tw:cursor-pointer"
              hx-get="{% url 'exchange_rates_list_pair' %}" hx-target="#exchange-rates-table"
              hx-vals='{"page": {{ page_obj.paginator.num_pages }}, "from": "{{ from_currency|default_if_none:"" }}", "to": "{{ to_currency|default_if_none:"" }}"}'
              hx-include="#filter, #order"
@@ -115,7 +115,7 @@
         </li>
       {% endif %}
       <li class="page-item">
-        <a class="page-link {% if not page_obj.has_next %}disabled{% endif %} tw-cursor-pointer"
+        <a class="page-link {% if not page_obj.has_next %}disabled{% endif %} tw:cursor-pointer"
            hx-get="{% if page_obj.has_next %}{% url 'exchange_rates_list_pair' %}{% endif %}"
            hx-vals='{"page": {{ page_obj.paginator.num_pages }}, "from": "{{ from_currency|default_if_none:"" }}", "to": "{{ to_currency|default_if_none:"" }}"}'
            hx-include="#filter, #order"

app/templates/import_app/fragments/profiles/add.html

@@ -8,7 +8,7 @@
 {% block body %}
 {% if message %}
 <div class="alert alert-info" role="alert" id="msg" hx-preserve="true">
-  <h6 class="alert-heading tw-italic tw-font-bold">{% trans 'A message from the author' %}</h6>
+  <h6 class="alert-heading tw:italic tw:font-bold">{% trans 'A message from the author' %}</h6>
   <hr>
   <p class="mb-0">{{ message|linebreaksbr }}</p>
 </div>

app/templates/import_app/fragments/profiles/list.html

@@ -1,11 +1,11 @@
 {% load i18n %}
 <div class="container px-md-3 py-3 column-gap-5">
-  <div class="tw-text-3xl fw-bold font-monospace tw-w-full mb-3">
+  <div class="tw:text-3xl fw-bold font-monospace tw:w-full mb-3">
     {% spaceless %}
     <div>{% translate 'Import Profiles' %}<span>
       <span class="dropdown" data-bs-toggle="tooltip"
                 data-bs-title="{% translate "Add" %}">
-        <a class="text-decoration-none tw-text-2xl p-1" role="button"
+        <a class="text-decoration-none tw:text-2xl p-1" role="button"
                 data-bs-toggle="dropdown"
                 data-bs-title="{% translate "Add" %}" aria-expanded="false">
           <i class="fa-solid fa-circle-plus fa-fw"></i>

app/templates/import_app/fragments/runs/list.html

@@ -15,20 +15,20 @@
     {% for run in runs %}
       <div class="col">
         <div class="card">
-          <div class="card-header tw-text-sm {% if run.status == run.Status.QUEUED %}tw-text-white{% elif run.status == run.Status.PROCESSING %}text-warning{% elif run.status == run.Status.FINISHED %}text-success{% else %}text-danger{% endif %}">
+          <div class="card-header tw:text-sm {% if run.status == run.Status.QUEUED %}text-body{% elif run.status == run.Status.PROCESSING %}text-warning{% elif run.status == run.Status.FINISHED %}text-success{% else %}text-danger{% endif %}">
             <span><i class="fa-solid {% if run.status == run.Status.QUEUED %}fa-hourglass-half{% elif run.status == run.Status.PROCESSING %}fa-spinner{% elif run.status == run.Status.FINISHED %}fa-check{% else %}fa-xmark{% endif %} fa-fw me-2"></i>{{ run.get_status_display }}</span>
           </div>
           <div class="card-body">
-            <h5 class="card-title"><i class="fa-solid fa-hashtag me-1 tw-text-xs tw-text-gray-400"></i>{{ run.id }}<span class="tw-text-xs tw-text-gray-400 ms-1">({{ run.file_name }})</span></h5>
+            <h5 class="card-title"><i class="fa-solid fa-hashtag me-1 tw:text-xs tw:text-gray-400"></i>{{ run.id }}<span class="tw:text-xs tw:text-gray-400 ms-1">({{ run.file_name }})</span></h5>
             <hr>
             <div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 w-100 g-4">
               <div class="col">
                 <div class="d-flex flex-row">
                   <div class="d-flex flex-column">
-                    <div class="text-body-secondary tw-text-xs tw-font-medium">
+                    <div class="text-body-secondary tw:text-xs tw:font-medium">
                       {% trans 'Total Items' %}
                     </div>
-                    <div class="tw-text-sm">
+                    <div class="tw:text-sm">
                       {{ run.total_rows }}
                     </div>
                   </div>
@@ -38,10 +38,10 @@
               <div class="col">
                 <div class="d-flex flex-row">
                   <div class="d-flex flex-column">
-                    <div class="text-body-secondary tw-text-xs tw-font-medium">
+                    <div class="text-body-secondary tw:text-xs tw:font-medium">
                       {% trans 'Processed Items' %}
                     </div>
-                    <div class="tw-text-sm">
+                    <div class="tw:text-sm">
                       {{ run.processed_rows }}
                     </div>
                   </div>
@@ -51,10 +51,10 @@
               <div class="col">
                 <div class="d-flex flex-row">
                   <div class="d-flex flex-column">
-                    <div class="text-body-secondary tw-text-xs tw-font-medium">
+                    <div class="text-body-secondary tw:text-xs tw:font-medium">
                       {% trans 'Skipped Items' %}
                     </div>
-                    <div class="tw-text-sm">
+                    <div class="tw:text-sm">
                       {{ run.skipped_rows }}
                     </div>
                   </div>
@@ -64,10 +64,10 @@
               <div class="col">
                 <div class="d-flex flex-row">
                   <div class="d-flex flex-column">
-                    <div class="text-body-secondary tw-text-xs tw-font-medium">
+                    <div class="text-body-secondary tw:text-xs tw:font-medium">
                       {% trans 'Failed Items' %}
                     </div>
-                    <div class="tw-text-sm">
+                    <div class="tw:text-sm">
                       {{ run.failed_rows }}
                     </div>
                   </div>
@@ -77,10 +77,10 @@
               <div class="col">
                 <div class="d-flex flex-row">
                   <div class="d-flex flex-column">
-                    <div class="text-body-secondary tw-text-xs tw-font-medium">
+                    <div class="text-body-secondary tw:text-xs tw:font-medium">
                       {% trans 'Successful Items' %}
                     </div>
-                    <div class="tw-text-sm">
+                    <div class="tw:text-sm">
                       {{ run.successful_rows }}
                     </div>
                   </div>

app/templates/import_app/fragments/runs/log.html

@@ -5,7 +5,7 @@
 {% block title %}{% translate 'Logs for' %} #{{ run.id }}{% endblock %}
 
 {% block body %}
-<div class="card tw-max-h-full tw-overflow-auto">
+<div class="card tw:max-h-full tw:overflow-auto">
   <div class="card-body">
     {{ run.logs|linebreaks }}
   </div>

app/templates/includes/navbar.html

@@ -12,7 +12,7 @@
       <span class="navbar-toggler-icon"></span>
     </button>
     <div class="collapse navbar-collapse" id="navbarContent">
-      <ul class="navbar-nav me-auto mb-2 mb-lg-0 nav-underline" hx-push-url="true">
+      <ul class="navbar-nav me-auto mb-3 mb-lg-0 nav-underline" hx-push-url="true">
         <li class="nav-item dropdown">
           <a class="nav-link dropdown-toggle {% active_link views='monthly_overview||yearly_overview_currency||yearly_overview_account||calendar' %}"
              href="#"
@@ -50,7 +50,7 @@
           <a class="nav-link {% active_link views='insights_index' %}" href="{% url 'insights_index' %}">{% trans 'Insights' %}</a>
         </li>
         <li class="nav-item dropdown">
-          <a class="nav-link dropdown-toggle {% active_link views='installment_plans_index||recurring_trasanctions_index||transactions_all_index||transactions_trash_index' %}"
+          <a class="nav-link dropdown-toggle {% active_link views='installment_plans_index||quick_transactions_index||recurring_trasanctions_index||transactions_all_index||transactions_trash_index' %}"
              href="#" role="button"
              data-bs-toggle="dropdown"
              aria-expanded="false">
@@ -68,6 +68,8 @@
             {% endif %}
             <hr class="dropdown-divider">
             </li>
+            <li><a class="dropdown-item {% active_link views='quick_transactions_index' %}"
+                   href="{% url 'quick_transactions_index' %}">{% translate 'Quick Transactions' %}</a></li>
             <li><a class="dropdown-item {% active_link views='installment_plans_index' %}"
                    href="{% url 'installment_plans_index' %}">{% translate 'Installment Plans' %}</a></li>
             <li><a class="dropdown-item {% active_link views='recurring_trasanctions_index' %}"
@@ -159,16 +161,16 @@
           </ul>
         </li>
       </ul>
-      <ul class="navbar-nav mt-3 mb-2 mb-lg-0 mt-lg-0">
-        <li class="nav-item text-center w-100">
-          <a class="nav-item tw-text-2xl tw-cursor-pointer me-lg-4"
+      <ul class="navbar-nav mb-2 mb-lg-0 gap-3">
+        <li class="nav-item">
+          <div class="nav-link tw:lg:text-2xl! tw:cursor-pointer"
              data-bs-toggle="tooltip" data-bs-placement="left" data-bs-title="{% trans "Calculator" %}"
              _="on click trigger show on #calculator">
             <i class="fa-solid fa-calculator"></i>
-          </a>
+            <span class="d-lg-none d-inline">{% trans "Calculator" %}</span>
+          </div>
         </li>
-        <li class="text-center w-100">{% include 'includes/navbar/user_menu.html' %}</li>
-
+        <li class="w-100">{% include 'includes/navbar/user_menu.html' %}</li>
       </ul>
     </div>
   </div>

app/templates/includes/navbar/user_menu.html

@@ -1,9 +1,10 @@
 {% load settings %}
 {% load i18n %}
 <div class="dropdown">
-  <a class="tw-text-2xl" type="button" data-bs-toggle="dropdown" aria-expanded="false">
+  <div class="nav-link tw:lg:text-2xl! tw:cursor-pointer" type="button" data-bs-toggle="dropdown" aria-expanded="false">
     <i class="fa-solid fa-user"></i>
-  </a>
+    <span class="d-lg-none d-inline">{% trans "Profile" %}</span>
+  </div>
   <ul class="dropdown-menu dropdown-menu-start dropdown-menu-lg-end">
     <li class="dropdown-item-text">{{ user.email }}</li>
     <li><hr class="dropdown-divider"></li>

app/templates/includes/placeholders.html

@@ -1,14 +1,14 @@
 {# We use this to preload dynamically generated tailwind classes so the compiler can build them ahead of time #}
 
-<div class="tw-text-blue-800"></div>
-<div class="tw-text-yellow-800"></div>
-<div class="tw-text-red-800"></div>
-<div class="tw-text-green-800"></div>
-<div class="tw-text-blue-400"></div>
-<div class="tw-text-yellow-400"></div>
-<div class="tw-text-red-400"></div>
-<div class="tw-text-green-400"></div>
-<div class="tw-bg-blue-300"></div>
-<div class="tw-bg-yellow-300"></div>
-<div class="tw-bg-red-300"></div>
-<div class="tw-bg-green-300"></div>
+<div class="tw:text-blue-800"></div>
+<div class="tw:text-yellow-800"></div>
+<div class="tw:text-red-800"></div>
+<div class="tw:text-green-800"></div>
+<div class="tw:text-blue-400"></div>
+<div class="tw:text-yellow-400"></div>
+<div class="tw:text-red-400"></div>
+<div class="tw:text-green-400"></div>
+<div class="tw:bg-blue-300"></div>
+<div class="tw:bg-yellow-300"></div>
+<div class="tw:bg-red-300"></div>
+<div class="tw:bg-green-300"></div>

app/templates/includes/scripts/hyperscript/sounds.html

@@ -1,15 +1,19 @@
 <script type="text/hyperscript">
 on paid if body do not include #settings-mute-sound
   js
+    volume = JSON.parse(document.getElementById('volume').textContent) / 10
     paidSound.pause()
     paidSound.currentTime = 0
+    paidSound.volume = volume
     paidSound.play()
   end
 end
 on unpaid if body do not include #settings-mute-sound
   js
+    volume = JSON.parse(document.getElementById('volume').textContent) / 10
     unpaidSound.pause()
     unpaidSound.currentTime = 0
+    unpaidSound.volume = volume
     unpaidSound.play()
   end
 end

app/templates/includes/styles.html

@@ -1,4 +1,3 @@
 {% load webpack_loader %}
 
 {% stylesheet_pack 'style' %}
-{#{% stylesheet_pack 'select' %}#}

app/templates/includes/tools/calculator.html

@@ -1,5 +1,5 @@
 {% load formats %}
-<div class="tw-hidden tw-w-[60vw] lg:tw-w-[30vw] xl:tw-w-[20vw] position-fixed shadow rounded-3 bg-body tw-border-gray-700 tw-border tw-border-solid tw-text-center tw-align-middle tw-z-[2000] tw-touch-none user-select-none"
+<div class="tw:hidden tw:w-[60vw] tw:lg:w-[30vw] tw:xl:w-[20vw] position-fixed shadow rounded-3 bg-body tw:border-gray-700 tw:border tw:border-solid tw:text-center tw:align-middle tw:z-[2000] tw:touch-none user-select-none"
      id="calculator"
      hx-preserve
      _="
@@ -13,8 +13,8 @@
           on focusin halt the event end -- this prevents bootstrap's static offcanvas from hijacking the focus from the input when open end
 
           on show or keyup[code is 'KeyC' and altKey is true] from body
-            if my.classList.contains('tw-hidden')
-              remove .tw-hidden from me
+            if my.classList.contains('tw:hidden')
+              remove .{'tw:hidden'} from me
               measure my width, height
               set xoff to (window.innerWidth/2) - (width/2)
               set yoff to (window.innerHeight/2) - (height)
@@ -23,7 +23,7 @@
               then call #calculator-input.focus()
             else
               add .scale-out-center to me then wait for animationend then remove .scale-out-center from me
-              add .tw-hidden to me
+              add .{'tw:hidden'} to me
             end
           end
 
@@ -48,7 +48,7 @@
           end">
 
       <div id="calculator-handle"
-           class="position-absolute bg-secondary rounded-top-2 tw-cursor-move d-flex align-items-center justify-content-center tw-top-[-20px] tw-left-[3px] tw-w-[2em] tw-h-[20px]">
+           class="position-absolute bg-secondary rounded-top-2 tw:cursor-move d-flex align-items-center justify-content-center tw:top-[-20px] tw:left-[3px] tw:w-[2em] tw:h-[20px]">
         <i class="fa-solid fa-grip"></i>
       </div>
 
@@ -73,31 +73,31 @@
                   end
                   then set localizedResult to it
                   set #calculator-result.innerText to localizedResult
-                  then remove .tw-hidden from #calculator-result-container
+                  then remove .{'tw:hidden'} from #calculator-result-container
                   then add .swing-in-top-fwd to #calculator-result-container
                   then settle
                   then remove .swing-in-top-fwd from #calculator-result-container
                 else
                   add .swing-out-top-bck to #calculator-result-container
                   then settle
-                  then add .tw-hidden to #calculator-result-container
+                  then add .{'tw:hidden'} to #calculator-result-container
                   then remove .swing-out-top-bck from #calculator-result-container
                 end
               catch e
                 add .swing-out-top-bck to #calculator-result-container
                 then settle
-                then add .tw-hidden to #calculator-result-container
+                then add .{'tw:hidden'} to #calculator-result-container
                 then remove .swing-out-top-bck from #calculator-result-container
               end"
              placeholder="2 + 2">
-      <div class="tw-hidden" id="calculator-result-container">
+      <div class="tw:hidden" id="calculator-result-container">
         <div class="d-flex flex-row p-2 justify-content-between">
-          <div class="tw-text-gray-400">=</div>
+          <div class="tw:text-gray-400">=</div>
           <div id="calculator-result" class="user-select-all"></div>
         </div>
       </div>
-      <div class="position-absolute tw-cursor-pointer top-0 start-100 translate-middle tw-p-0 text-bg-primary border border-light rounded-circle tw-flex tw-items-center tw-justify-center tw-w-5 tw-h-5"
+      <div class="position-absolute tw:cursor-pointer top-0 start-100 translate-middle tw:p-0 text-bg-primary border border-light rounded-circle tw:flex tw:items-center tw:justify-center tw:w-5 tw:h-5"
             _="on click trigger show on #calculator">
-        <i class="fa-solid fa-xmark tw-flex tw-items-center tw-justify-center tw-w-full tw-h-full"></i>
+        <i class="fa-solid fa-xmark tw:flex tw:items-center tw:justify-center tw:w-full tw:h-full"></i>
       </div>
     </div>

app/templates/insights/fragments/emergency_fund.html

@@ -12,17 +12,17 @@
                     data-bs-target="#flush-collapse-{{ id }}" aria-expanded="false"
                     aria-controls="flush-collapse-{{ id }}">
               <span>
-                <span class="tw-text-gray-300">{% trans "You've spent an average of" %}</span>
+                <span class="tw:text-gray-300">{% trans "You've spent an average of" %}</span>
                 <c-amount.display
                     :amount="data.average"
                     :prefix="data.currency.prefix"
                     :suffix="data.currency.suffix"
                     :decimal_places="data.currency.decimal_places"
-                    custom_class="tw-text-3xl"
+                    custom_class="tw:text-3xl"
                     divless></c-amount.display>
-                <span class="tw-text-gray-300">{% trans 'on the last 12 months, at this rate you could go by' %}</span>
-                <span class="tw-text-3xl">{{ data.months }}</span>
-                <span class="tw-text-gray-300">{% trans 'months without any income.' %}</span>
+                <span class="tw:text-gray-300">{% trans 'on the last 12 months, at this rate you could go by' %}</span>
+                <span class="tw:text-3xl">{{ data.months }}</span>
+                <span class="tw:text-gray-300">{% trans 'months without any income.' %}</span>
               </span>
             </button>
           </h2>
@@ -31,7 +31,7 @@
             <div class="accordion-body">
               <div class="d-flex justify-content-between align-items-baseline mt-2">
                 <div class="text-end font-monospace">
-                  <div class="tw-text-gray-400">{% translate 'average expenses' %}</div>
+                  <div class="tw:text-gray-400">{% translate 'average expenses' %}</div>
                 </div>
                 <div class="dotted-line flex-grow-1"></div>
                 <div class="text-end font-monospace">
@@ -45,7 +45,7 @@
               </div>
               <div class="d-flex justify-content-between align-items-baseline mt-2">
                 <div class="text-end font-monospace">
-                  <div class="tw-text-gray-400">{% translate 'liquid total' %}</div>
+                  <div class="tw:text-gray-400">{% translate 'liquid total' %}</div>
                 </div>
                 <div class="dotted-line flex-grow-1"></div>
                 <div class="text-end font-monospace">
@@ -59,7 +59,7 @@
               </div>
               <div class="d-flex justify-content-between align-items-baseline mt-2">
                 <div class="text-end font-monospace">
-                  <div class="tw-text-gray-400">{% translate 'months left' %}</div>
+                  <div class="tw:text-gray-400">{% translate 'months left' %}</div>
                 </div>
                 <div class="dotted-line flex-grow-1"></div>
                 <div class="text-end font-monospace">

app/templates/insights/fragments/sankey.html

@@ -7,7 +7,7 @@
   <div class="show-loading" hx-get="{% url 'insights_sankey_by_currency' %}" hx-trigger="updated from:window"
        hx-swap="outerHTML" hx-include="#picker-form, #picker-type">
 {% endif %}
-<div class="chart-container position-relative tw-min-h-[85vh] tw-max-h-[85vh] tw-h-full tw-w-full"
+<div class="chart-container position-relative tw:min-h-[85vh] tw:max-h-[85vh] tw:h-full tw:w-full"
      id="sankeyContainer"
      _="init call setupSankeyChart() end">
   <canvas id="sankeyChart"></canvas>

app/templates/insights/pages/index.html

@@ -8,27 +8,27 @@
   <div class="container-fluid">
     <div class="row my-3 h-100">
       <div class="col-lg-2 col-md-3 mb-3 mb-md-0">
-        <div class="position-sticky tw-top-3">
+        <div class="position-sticky tw:top-3">
           <div class="">
             <div class="mb-2 w-100 d-lg-inline-flex d-grid gap-2 flex-wrap justify-content-lg-center" role="group"
                  _="on change
                     set type to event.target.value
-                    add .tw-hidden to <#picker-form > div:not(.tw-hidden)/>
+                    add .tw:hidden to <#picker-form > div:not(.tw:hidden)/>
 
                     if type == 'month'
-                      remove .tw-hidden from #month-form
+                      remove .tw:hidden from #month-form
                     end
                     if type == 'year'
-                      remove .tw-hidden from #year-form
+                      remove .tw:hidden from #year-form
                     end
                     if type == 'month-range'
-                      remove .tw-hidden from #month-range-form
+                      remove .tw:hidden from #month-range-form
                     end
                     if type == 'year-range'
-                      remove .tw-hidden from #year-range-form
+                      remove .tw:hidden from #year-range-form
                     end
                     if type == 'date-range'
-                      remove .tw-hidden from #date-range-form
+                      remove .tw:hidden from #date-range-form
                     end
                     then trigger updated"
                  id="picker-type">
@@ -60,16 +60,16 @@
               <div id="month-form" class="">
                 {% crispy month_form %}
               </div>
-              <div id="year-form" class="tw-hidden">
+              <div id="year-form" class="tw:hidden">
                 {% crispy year_form %}
               </div>
-              <div id="month-range-form" class="tw-hidden">
+              <div id="month-range-form" class="tw:hidden">
                 {% crispy month_range_form %}
               </div>
-              <div id="year-range-form" class="tw-hidden">
+              <div id="year-range-form" class="tw:hidden">
                 {% crispy year_range_form %}
               </div>
-              <div id="date-range-form" class="tw-hidden">
+              <div id="date-range-form" class="tw:hidden">
                 {% crispy date_range_form %}
               </div>
             </form>

app/templates/installment_plans/fragments/list.html

@@ -1,9 +1,9 @@
 {% load i18n %}
 <div class="container px-md-3 py-3 column-gap-5">
-  <div class="tw-text-3xl fw-bold font-monospace tw-w-full mb-3">
+  <div class="tw:text-3xl fw-bold font-monospace tw:w-full mb-3">
     {% spaceless %}
     <div>{% translate 'Installment Plans' %}<span>
-      <a class="text-decoration-none tw-text-2xl p-1 category-action"
+      <a class="text-decoration-none tw:text-2xl p-1 category-action"
                 role="button"
                 data-bs-toggle="tooltip"
                 data-bs-title="{% translate "Add" %}"

app/templates/installment_plans/fragments/table.html

@@ -64,10 +64,10 @@
             </div>
           </td>
           <td class="col">
-            <div class="{% if installment_plan.type == 'EX' %}tw-text-red-400{% else %}tw-text-green-400{% endif %}">
+            <div class="{% if installment_plan.type == 'EX' %}tw:text-red-400{% else %}tw:text-green-400{% endif %}">
               {{ installment_plan.description }}
             </div>
-            <div class="tw-text-sm tw-text-gray-400">{{ installment_plan.notes|linebreaksbr }}</div>
+            <div class="tw:text-sm tw:text-gray-400">{{ installment_plan.notes|linebreaksbr }}</div>
           </td>
         </tr>
         {% endfor %}

app/templates/mini_tools/currency_converter/currency_converter.html

@@ -11,7 +11,7 @@
   <div class="container px-md-3 py-3 column-gap-5"
        _="install init_tom_select
           install init_datepicker">
-    <div class="tw-text-3xl fw-bold font-monospace tw-w-full mb-3">
+    <div class="tw:text-3xl fw-bold font-monospace tw:w-full mb-3">
       <div>{% translate 'Currency Converter' %}</div>
     </div>
     <div class="row">
@@ -27,7 +27,7 @@
         </div>
         <div>{{ form.from_currency|as_crispy_field }}</div>
       </div>
-      <div class="col text-primary tw-flex tw-items-center tw-justify-center my-3 my-lg-0">
+      <div class="col text-primary tw:flex tw:items-center tw:justify-center my-3 my-lg-0">
         <i class="fa-solid fa-equals"></i>
       </div>
       <div class="col-12 col-lg-5">
@@ -45,7 +45,7 @@
       </div>
     </div>
     <div class="row">
-      <div class="tw-cursor-pointer text-primary text-end"
+      <div class="tw:cursor-pointer text-primary text-end"
            _="on click
                 set from_value to #id_from_currency's value
                 set to_value to #id_to_currency's value
@@ -66,7 +66,7 @@
             {% for rate in data.rates.values %}
               <div class="d-flex justify-content-between align-items-baseline mt-2">
                 <div class="text-end font-monospace">
-                  <div class="tw-text-gray-400">
+                  <div class="tw:text-gray-400">
 {#                    <c-amount.display#}
 {#                        :amount="1"#}
 {#                        :prefix="data.prefix"#}
@@ -76,7 +76,7 @@
                 </div>
                 <div class="dotted-line flex-grow-1"></div>
                 {% if currency.income_projected != 0 %}
-                  <div class="text-end font-monospace tw-text-green-400">
+                  <div class="text-end font-monospace tw:text-green-400">
                     <c-amount.display
                         :amount="rate.rate"
                         :prefix="rate.prefix"

app/templates/mini_tools/unit_price_calculator.html

@@ -6,7 +6,7 @@
 
 {% block content %}
   <div class="container px-md-3 py-3 column-gap-5">
-    <div class="tw-text-3xl fw-bold font-monospace tw-w-full mb-3">
+    <div class="tw:text-3xl fw-bold font-monospace tw:w-full mb-3">
       <div>{% translate 'Unit Price Calculator' %}</div>
     </div>
     <div class="card mb-3 d-none" id="card-placeholder">
@@ -36,7 +36,7 @@
           </div>
           <div class="col-lg">
             <label class="form-label">{% trans 'Unit price' %}</label>
-            <div class="unit-price tw-text-xl" data-amount="0">0</div>
+            <div class="unit-price tw:text-xl" data-amount="0">0</div>
           </div>
         </div>
       </div>
@@ -109,7 +109,7 @@
             </div>
             <div class="col-lg">
               <label class="form-label">{% trans 'Unit price' %}</label>
-              <div class="unit-price tw-text-xl" data-amount="0">0</div>
+              <div class="unit-price tw:text-xl" data-amount="0">0</div>
             </div>
           </div>
         </div>
@@ -134,7 +134,7 @@
             </div>
             <div class="col-lg">
               <label class="form-label">{% trans 'Unit price' %}</label>
-              <div class="unit-price tw-text-xl" data-amount="0">0</div>
+              <div class="unit-price tw:text-xl" data-amount="0">0</div>
             </div>
           </div>
         </div>

app/templates/monthly_overview/fragments/list.html

@@ -6,7 +6,7 @@
   {% for x in transactions_by_date %}
     <div id="{{ x.grouper|slugify }}" class="transactions-divider"
          _="on htmx:afterSwap from #transactions if sessionStorage.getItem(my id) is null then sessionStorage.setItem(my id, 'true')">
-      <div class="mt-3 mb-1 w-100 tw-text-base border-bottom bg-body transactions-divider-title">
+      <div class="mt-3 mb-1 w-100 tw:text-base border-bottom bg-body transactions-divider-title">
         <a class="text-decoration-none d-inline-block w-100"
            role="button"
            data-bs-toggle="collapse"

app/templates/monthly_overview/fragments/monthly_summary.html

@@ -6,7 +6,7 @@
     <c-ui.info-card color="yellow" icon="fa-solid fa-calendar-day" title="{% trans 'Daily Spending Allowance' %}" help_text={% trans "This is the final total divided by the remaining days in the month" %}>
       <div class="d-flex justify-content-between mt-3">
           <div class="text-end font-monospace">
-            <div class="tw-text-gray-400">{% translate 'today' %}</div>
+            <div class="tw:text-gray-400">{% translate 'today' %}</div>
           </div>
           <div class="text-end font-monospace">
             {% for currency in daily_spending_allowance.values %}
@@ -39,7 +39,7 @@
       <c-ui.info-card color="green" icon="fa-solid fa-arrow-right-to-bracket" title="{% trans 'Income' %}">
         <div class="d-flex justify-content-between mt-3">
           <div class="text-end font-monospace">
-            <div class="tw-text-gray-400">{% translate 'current' %}</div>
+            <div class="tw:text-gray-400">{% translate 'current' %}</div>
           </div>
           <div class="text-end font-monospace">
             {% for currency in income_current.values %}
@@ -69,7 +69,7 @@
         <hr class="my-1">
         <div class="d-flex justify-content-between">
           <div class="text-end font-monospace">
-            <div class="tw-text-gray-400">{% translate 'projected' %}</div>
+            <div class="tw:text-gray-400">{% translate 'projected' %}</div>
           </div>
           <div class="text-end font-monospace">
             {% for currency in income_projected.values %}
@@ -103,7 +103,7 @@
       <c-ui.info-card color="red" icon="fa-solid fa-arrow-right-from-bracket" title="{% trans 'Expenses' %}">
         <div class="d-flex justify-content-between mt-3">
           <div class="text-end font-monospace">
-            <div class="tw-text-gray-400">{% translate 'current' %}</div>
+            <div class="tw:text-gray-400">{% translate 'current' %}</div>
           </div>
           <div class="text-end font-monospace">
             {% for currency in expense_current.values %}
@@ -133,7 +133,7 @@
         <hr class="my-1">
         <div class="d-flex justify-content-between">
           <div class="text-end font-monospace">
-            <div class="tw-text-gray-400">{% translate 'projected' %}</div>
+            <div class="tw:text-gray-400">{% translate 'projected' %}</div>
           </div>
           <div class="text-end font-monospace">
             {% for currency in expense_projected.values %}
@@ -167,7 +167,7 @@
     <c-ui.info-card color="blue" icon="fa-solid fa-scale-balanced" title="{% trans 'Total' %}">
         <div class="d-flex justify-content-between mt-3">
           <div class="text-end font-monospace">
-            <div class="tw-text-gray-400">{% translate 'current' %}</div>
+            <div class="tw:text-gray-400">{% translate 'current' %}</div>
           </div>
           <div class="text-end font-monospace">
             {% for currency in total_current.values %}
@@ -196,7 +196,7 @@
         </div>
         <div class="d-flex justify-content-between mt-3">
           <div class="text-end font-monospace">
-            <div class="tw-text-gray-400">{% translate 'projected' %}</div>
+            <div class="tw:text-gray-400">{% translate 'projected' %}</div>
           </div>
           <div class="text-end font-monospace">
             {% for currency in total_projected.values %}
@@ -256,7 +256,7 @@
   <div class="col">
     <c-ui.info-card color="yellow" icon="fa-solid fa-percent" title="{% trans 'Distribution' %}">
       {% for p in percentages.values %}
-        <p class="tw-text-gray-400 mb-2 {% if not forloop.first %}mt-3{% endif %}">{{ p.currency.name }}</p>
+        <p class="tw:text-gray-400 mb-2 {% if not forloop.first %}mt-3{% endif %}">{{ p.currency.name }}</p>
         <c-ui.percentage-distribution :percentage="p"></c-ui.percentage-distribution>
       {% endfor %}
     </c-ui.info-card>

app/templates/monthly_overview/pages/overview.html

@@ -17,7 +17,7 @@
     <div class="row mb-3 gx-xl-4 gy-3 mb-4">
       {#    Date picker#}
       <div class="col-12 col-xl-4 flex-row align-items-center d-flex">
-        <div class="tw-text-base h-100 align-items-center d-flex">
+        <div class="tw:text-base h-100 align-items-center d-flex">
           <a role="button"
              class="pe-4 py-2"
              hx-boost="true"
@@ -25,7 +25,7 @@
              href="{% url 'monthly_overview' month=previous_month year=previous_year %}"><i
               class="fa-solid fa-chevron-left"></i></a>
         </div>
-        <div class="tw-text-3xl fw-bold font-monospace tw-w-full text-center"
+        <div class="tw:text-3xl fw-bold font-monospace tw:w-full text-center"
              hx-get="{% url 'month_year_picker' %}"
              hx-target="#generic-offcanvas-left"
              hx-trigger="click, date_picker from:window"
@@ -33,7 +33,7 @@
              role="button">
           {{ month|month_name }} {{ year }}
         </div>
-        <div class="tw-text-base mx-2 h-100 align-items-center d-flex">
+        <div class="tw:text-base mx-2 h-100 align-items-center d-flex">
           <a role="button"
              class="ps-3 py-2"
              hx-boost="true"
@@ -104,7 +104,7 @@
             <div id="summary"
                  hx-get="{% url 'monthly_summary' month=month year=year %}"
                  class="show-loading"
-                 hx-trigger="load, updated from:window, selective_update from:window">
+                 hx-trigger="load, updated from:window, selective_update from:window, every 10m">
             </div>
           </div>
           <div class="tab-pane fade {% if summary_tab == 'currency' %}show active{% endif %}"
@@ -115,7 +115,7 @@
             <div id="currency-summary"
                  hx-get="{% url 'monthly_currency_summary' month=month year=year %}"
                  class="show-loading"
-                 hx-trigger="load, updated from:window, selective_update from:window">
+                 hx-trigger="load, updated from:window, selective_update from:window, every 10m">
             </div>
           </div>
           <div class="tab-pane fade {% if summary_tab == 'account' %}show active{% endif %}"
@@ -126,7 +126,7 @@
             <div id="account-summary"
                  hx-get="{% url 'monthly_account_summary' month=month year=year %}"
                  class="show-loading"
-                 hx-trigger="load, updated from:window, selective_update from:window">
+                 hx-trigger="load, updated from:window, selective_update from:window, every 10m">
             </div>
           </div>
         </div>
@@ -143,11 +143,11 @@
             </button>
           </div>
           {#        Ordering button#}
-          <div class="col-sm-6 col-12 tw-content-center my-3 my-sm-0">
+          <div class="col-sm-6 col-12 tw:content-center my-3 my-sm-0">
             <div class="text-sm-end" _="on change trigger updated on window">
               <label for="order">{% translate "Order by" %}</label>
               <select
-                  class="tw-border-0 focus-visible:tw-outline-0 w-full pe-2 tw-leading-normal text-bg-tertiary tw-font-medium rounded"
+                  class="tw:border-0 tw:focus-visible:outline-0 w-full pe-2 tw:leading-normal text-bg-tertiary tw:font-medium rounded bg-body text-body"
                   name="order" id="order">
                 <option value="default"
                         {% if order == 'default' %}selected{% endif %}>{% translate 'Default' %}</option>
@@ -191,7 +191,7 @@
         <div id="transactions"
              class="show-loading"
              hx-get="{% url 'monthly_transactions_list' month=month year=year %}"
-             hx-trigger="load, updated from:window" hx-include="#filter, #order">
+             hx-trigger="load, updated from:window, every 10m" hx-include="#filter, #order">
         </div>
       </div>
     </div>

app/templates/net_worth/net_worth.html

@@ -9,6 +9,7 @@
 {% block title %}{% if type == "current" %}{% translate 'Current Net Worth' %}{% else %}{% translate 'Projected Net Worth' %}{% endif %}{% endblock %}
 
 {% block content %}
+  <div hx-trigger="every 60m" class="show-loading" hx-get="" hx-target="body">
   <div class="container px-md-3 py-3" _="init call initializeAccountChart() then initializeCurrencyChart() end">
     <div class="row gx-xl-4 gy-3 mb-4">
       <div class="col-12 col-xl-5">
@@ -19,7 +20,7 @@
               {% for currency in currency_net_worth.values %}
                 <div class="d-flex justify-content-between mt-2">
                   <div class="d-flex align-items-baseline w-100">
-                    <div class="currency-name text-start font-monospace tw-text-gray-300"
+                    <div class="currency-name text-start font-monospace tw:text-gray-300"
                          _="on click showOnlyCurrencyDataset('{{ currency.currency.name }}')">
                       {{ currency.currency.name }}
                     </div>
@@ -48,7 +49,7 @@
                 {% endif %}
                 {% if currency.consolidated and currency.consolidated.total_final != currency.total_final %}
                   <div class="d-flex align-items-baseline w-100">
-                        <div class="account-name text-start font-monospace tw-text-gray-300">
+                        <div class="account-name text-start font-monospace tw:text-gray-300">
                           <span class="hierarchy-line-icon"></span>{% trans 'Consolidated' %}</div>
                         <div class="dotted-line flex-grow-1"></div>
                         <div class="">
@@ -68,7 +69,7 @@
         </div>
       </div>
       <div class="col-12 col-xl-7">
-        <div class="chart-container position-relative tw-min-h-[40vh] tw-h-full">
+        <div class="chart-container position-relative tw:min-h-[40vh] tw:h-full">
           <canvas id="currencyBalanceChart"></canvas>
         </div>
       </div>
@@ -85,14 +86,14 @@
                 {% if data.grouper %}
                   <div class="d-flex justify-content-between mt-2">
                     <div class="d-flex align-items-baseline w-100">
-                      <div class="text-start font-monospace tw-text-gray-300"><span class="badge text-bg-primary">
+                      <div class="text-start font-monospace tw:text-gray-300"><span class="badge text-bg-primary">
                         {{ data.grouper }}</span></div>
                     </div>
                   </div>
                   {% for account in data.list %}
                     <div class="d-flex justify-content-between mt-2">
                       <div class="d-flex align-items-baseline w-100">
-                        <div class="account-name text-start font-monospace tw-text-gray-300"
+                        <div class="account-name text-start font-monospace tw:text-gray-300"
                              _="on click showOnlyAccountDataset('{{ account.account.name }}')">
                           <span class="hierarchy-line-icon"></span>{{ account.account.name }}</div>
                         <div class="dotted-line flex-grow-1"></div>
@@ -120,7 +121,7 @@
                   {% for account in data.list %}
                     <div class="d-flex justify-content-between mt-2">
                       <div class="d-flex align-items-baseline w-100">
-                        <div class="account-name text-start font-monospace tw-text-gray-300"
+                        <div class="account-name text-start font-monospace tw:text-gray-300"
                              _="on click showOnlyAccountDataset('{{ account.account.name }}')">
                           {{ account.account.name }}
                         </div>
@@ -152,7 +153,7 @@
         </div>
       </div>
       <div class="col-12 col-xl-7">
-        <div class="chart-container position-relative tw-min-h-[40vh] tw-h-full">
+        <div class="chart-container position-relative tw:min-h-[40vh] tw:h-full">
           <canvas id="accountBalanceChart"></canvas>
         </div>
       </div>
@@ -318,5 +319,5 @@
       call currencyChart.update()
     end
   </script>
-
+</div>
 {% endblock %}

app/templates/quick_transactions/fragments/add.html

@@ -0,0 +1,11 @@
+{% extends 'extends/offcanvas.html' %}
+{% load i18n %}
+{% load crispy_forms_tags %}
+
+{% block title %}{% translate 'Add quick transaction' %}{% endblock %}
+
+{% block body %}
+<form hx-post="{% url 'quick_transaction_add' %}" hx-target="#generic-offcanvas" novalidate>
+    {% crispy form %}
+</form>
+{% endblock %}

app/templates/quick_transactions/fragments/create_menu.html

@@ -0,0 +1,17 @@
+{% extends 'extends/offcanvas.html' %}
+{% load i18n %}
+{% load crispy_forms_tags %}
+
+{% block title %}{% translate 'Add quick transaction' %}{% endblock %}
+
+{% block body %}
+  <div class="list-group list-group-flush">
+    {% for qt in quick_transactions %}
+      <a hx-get="{% url 'quick_transaction_add_as_transaction' quick_transaction_id=qt.id %}"
+         class="list-group-item list-group-item-action tw:cursor-pointer {% if qt.type == 'EX' %}tw:text-red-400!{% else %}tw:text-green-400!{% endif %}">{{ qt.name }}</a>
+    {% empty %}
+      <c-msg.empty title="{% translate "Nothing to see here..." %}" remove-padding></c-msg.empty>
+    {% endfor %}
+  </div>
+
+{% endblock %}

app/templates/quick_transactions/fragments/edit.html

@@ -0,0 +1,13 @@
+{% extends 'extends/offcanvas.html' %}
+{% load i18n %}
+{% load crispy_forms_tags %}
+
+{% block title %}{% translate 'Edit quick transaction' %}{% endblock %}
+
+{% block body %}
+<form hx-post="{% url 'quick_transaction_edit' quick_transaction_id=quick_transaction.id %}"
+      hx-target="#generic-offcanvas"
+      novalidate>
+    {% crispy form %}
+</form>
+{% endblock %}

app/templates/quick_transactions/fragments/list.html

@@ -0,0 +1,59 @@
+{% load i18n %}
+<div class="card">
+  <div class="card-body">
+    <div id="quick-transactions-table">
+      {% if quick_transactions %}
+        <c-config.search></c-config.search>
+
+        <div class="table-responsive">
+          <table class="table table-hover align-middle">
+            <thead>
+            <tr>
+              <th scope="col" class="col-auto"></th>
+              <th scope="col" class="col">{% translate 'Name' %}</th>
+            </tr>
+            </thead>
+            <tbody>
+            {% for qt in quick_transactions %}
+              <tr class="recurring_transaction">
+                <td class="col-auto text-center">
+                  <div class="btn-group" role="group" aria-label="{% translate 'Actions' %}">
+                    <a class="btn btn-secondary btn-sm"
+                       role="button"
+                       data-bs-toggle="tooltip"
+                       data-bs-title="{% translate "Edit" %}"
+                       hx-get="{% url 'quick_transaction_edit' quick_transaction_id=qt.id %}"
+                       hx-swap="innerHTML"
+                       hx-target="#generic-offcanvas">
+                      <i class="fa-solid fa-pencil fa-fw"></i></a>
+                    <a class="btn btn-secondary btn-sm text-danger"
+                       role="button"
+                       data-bs-toggle="tooltip"
+                       data-bs-title="{% translate "Delete" %}"
+                       hx-delete="{% url 'quick_transaction_delete' quick_transaction_id=qt.id %}"
+                       hx-trigger='confirmed'
+                       hx-swap="innerHTML"
+                       data-bypass-on-ctrl="true"
+                       data-title="{% translate "Are you sure?" %}"
+                       data-text="{% translate "This will delete this item" %}"
+                       data-confirm-text="{% translate "Yes, delete it!" %}"
+                       _="install prompt_swal"><i class="fa-solid fa-trash fa-fw"></i></a>
+                  </div>
+                </td>
+                <td class="col">
+                  <div
+                      class="{% if qt.type == 'EX' %}tw:text-red-400{% else %}tw:text-green-400{% endif %}">
+                    {{ qt.name }}
+                  </div>
+                </td>
+              </tr>
+            {% endfor %}
+            </tbody>
+          </table>
+        </div>
+      {% else %}
+        <c-msg.empty title="{% translate "Nothing to see here..." %}" remove-padding></c-msg.empty>
+      {% endif %}
+    </div>
+  </div>
+</div>

app/templates/quick_transactions/pages/index.html

@@ -0,0 +1,25 @@
+{% extends "layouts/base.html" %}
+
+{% load i18n %}
+
+{% block title %}{% translate 'Quick Transactions' %}{% endblock %}
+
+{% block content %}
+<div class="container px-md-3 py-3 column-gap-5">
+  <div class="tw:text-3xl fw-bold font-monospace tw:w-full mb-3">
+    {% spaceless %}
+    <div>{% translate 'Quick Transactions' %}<span>
+      <a class="text-decoration-none tw:text-2xl p-1 category-action"
+                role="button"
+                data-bs-toggle="tooltip"
+                data-bs-title="{% translate "Add" %}"
+                hx-get="{% url 'quick_transaction_add' %}"
+                hx-target="#generic-offcanvas">
+            <i class="fa-solid fa-circle-plus fa-fw"></i></a>
+    </span></div>
+    {% endspaceless %}
+  </div>
+
+  <div id="quick-transactions-table" class="show-loading" hx-get="{% url 'quick_transactions_list' %}" hx-trigger="load, updated from:window"></div>
+</div>
+{% endblock %}

app/templates/recurring_transactions/fragments/list.html

@@ -1,9 +1,9 @@
 {% load i18n %}
 <div class="container px-md-3 py-3 column-gap-5">
-  <div class="tw-text-3xl fw-bold font-monospace tw-w-full mb-3">
+  <div class="tw:text-3xl fw-bold font-monospace tw:w-full mb-3">
     {% spaceless %}
     <div>{% translate 'Recurring Transactions' %}<span>
-      <a class="text-decoration-none tw-text-2xl p-1 category-action"
+      <a class="text-decoration-none tw:text-2xl p-1 category-action"
                 role="button"
                 data-bs-toggle="tooltip"
                 data-bs-title="{% translate "Add" %}"

app/templates/recurring_transactions/fragments/table.html

@@ -100,10 +100,10 @@
           </div>
         </td>
         <td class="col">
-          <div class="{% if recurring_transaction.type == 'EX' %}tw-text-red-400{% else %}tw-text-green-400{% endif %}">
+          <div class="{% if recurring_transaction.type == 'EX' %}tw:text-red-400{% else %}tw:text-green-400{% endif %}">
             {{ recurring_transaction.description }}
           </div>
-          <div class="tw-text-sm tw-text-gray-400">{{ recurring_transaction.notes|linebreaksbr }}</div>
+          <div class="tw:text-sm tw:text-gray-400">{{ recurring_transaction.notes|linebreaksbr }}</div>
         </td>
       </tr>
       {% endfor %}

app/templates/rules/fragments/list.html

@@ -1,9 +1,9 @@
 {% load i18n %}
 <div class="container px-md-3 py-3 column-gap-5">
-  <div class="tw-text-3xl fw-bold font-monospace tw-w-full mb-3">
+  <div class="tw:text-3xl fw-bold font-monospace tw:w-full mb-3">
     {% spaceless %}
       <div>{% translate 'Rules' %}<span>
-      <a class="text-decoration-none tw-text-2xl p-1 category-action"
+      <a class="text-decoration-none tw:text-2xl p-1 category-action"
          role="button"
          data-bs-toggle="tooltip"
          data-bs-title="{% translate "Add" %}"
@@ -76,13 +76,13 @@
                    data-bs-title="
                        {% if rule.active %}{% translate "Deactivate" %}{% else %}{% translate "Activate" %}{% endif %}"
                    hx-get="{% url 'transaction_rule_toggle_activity' transaction_rule_id=rule.id %}">
-                  {% if rule.active %}<i class="fa-solid fa-toggle-on tw-text-green-400"></i>{% else %}
-                    <i class="fa-solid fa-toggle-off tw-text-red-400"></i>{% endif %}
+                  {% if rule.active %}<i class="fa-solid fa-toggle-on tw:text-green-400"></i>{% else %}
+                    <i class="fa-solid fa-toggle-off tw:text-red-400"></i>{% endif %}
                 </a>
               </td>
               <td class="col">
                 <div>{{ rule.name }}</div>
-                <div class="tw-text-gray-400">{{ rule.description }}</div>
+                <div class="tw:text-gray-400">{{ rule.description }}</div>
               </td>
             </tr>
           {% endfor %}

app/templates/rules/fragments/transaction_rule/view.html

@@ -7,17 +7,17 @@
 {% block body %}
   <div hx-get="{% url 'transaction_rule_view' transaction_rule_id=transaction_rule.id %}"
        hx-trigger="updated from:window" hx-target="closest .offcanvas" class="show-loading">
-    <div class="tw-text-2xl">{{ transaction_rule.name }}</div>
-    <div class="tw-text-base tw-text-gray-400">{{ transaction_rule.description }}</div>
+    <div class="tw:text-2xl">{{ transaction_rule.name }}</div>
+    <div class="tw:text-base tw:text-gray-400">{{ transaction_rule.description }}</div>
     <hr>
     <div class="my-3">
-      <div class="tw-text-xl mb-2">{% translate 'If transaction...' %}</div>
+      <div class="tw:text-xl mb-2">{% translate 'If transaction...' %}</div>
       <div class="card">
         <div class="card-body">
           {{ transaction_rule.trigger }}
         </div>
         <div class="card-footer text-end">
-          <a class="text-decoration-none tw-text-gray-400 p-1"
+          <a class="text-decoration-none tw:text-gray-400 p-1"
              role="button"
              data-bs-toggle="tooltip"
              data-bs-title="{% translate "Edit" %}"
@@ -29,7 +29,7 @@
     </div>
 
     <div class="my-3">
-      <div class="tw-text-xl mb-2">{% translate 'Then...' %}</div>
+      <div class="tw:text-xl mb-2">{% translate 'Then...' %}</div>
       {% for action in transaction_rule.transaction_actions.all %}
         <div class="card mb-3">
           <div class="card-header">
@@ -41,7 +41,7 @@
             <div class="text-bg-secondary rounded-3 mt-3 p-2">{{ action.value }}</div>
           </div>
           <div class="card-footer text-end">
-            <a class="text-decoration-none tw-text-gray-400 p-1"
+            <a class="text-decoration-none tw:text-gray-400 p-1"
                role="button"
                data-bs-toggle="tooltip"
                data-bs-title="{% translate "Edit" %}"
@@ -74,7 +74,7 @@
             <div>{% trans 'Edit to view' %}</div>
           </div>
           <div class="card-footer text-end">
-            <a class="text-decoration-none tw-text-gray-400 p-1"
+            <a class="text-decoration-none tw:text-gray-400 p-1"
                role="button"
                data-bs-toggle="tooltip"
                data-bs-title="{% translate "Edit" %}"

app/templates/tags/fragments/list.html

@@ -1,9 +1,9 @@
 {% load i18n %}
 <div class="container px-md-3 py-3 column-gap-5">
-  <div class="tw-text-3xl fw-bold font-monospace tw-w-full mb-3">
+  <div class="tw:text-3xl fw-bold font-monospace tw:w-full mb-3">
     {% spaceless %}
     <div>{% translate 'Tags' %}<span>
-      <a class="text-decoration-none tw-text-2xl p-1 category-action"
+      <a class="text-decoration-none tw:text-2xl p-1 category-action"
                 role="button"
                 data-bs-toggle="tooltip"
                 data-bs-title="{% translate "Add" %}"

app/templates/transactions/fragments/list_all.html

@@ -7,7 +7,7 @@
   {% for x in transactions_by_date %}
     <div id="{{ x.grouper|slugify }}"
          _="on htmx:afterSettle from #transactions if sessionStorage.getItem(my id) is null then sessionStorage.setItem(my id, 'true')">
-      <div class="mt-3 mb-1 w-100 tw-text-base border-bottom bg-body">
+      <div class="mt-3 mb-1 w-100 tw:text-base border-bottom bg-body">
         <a class="text-decoration-none d-inline-block w-100"
            role="button"
            data-bs-toggle="collapse"
@@ -47,7 +47,7 @@
     <nav aria-label="{% translate 'Page navigation' %}">
     <ul class="pagination justify-content-center mt-5">
       <li class="page-item">
-        <a class="page-link tw-cursor-pointer {% if not page_obj.has_previous %}disabled{% endif %}"
+        <a class="page-link tw:cursor-pointer {% if not page_obj.has_previous %}disabled{% endif %}"
            hx-get="{% if page_obj.has_previous %}{% url 'transactions_all_list' %}{% endif %}"
            hx-vals='{"page": 1}'
            hx-include="#filter, #order"
@@ -68,13 +68,13 @@
               {% if page_number <= page_obj.number|add:3 and page_number >= page_obj.number|add:-3 %}
                   {% if page_obj.number == page_number %}
                       <li class="page-item active">
-                          <a class="page-link tw-cursor-pointer">
+                          <a class="page-link tw:cursor-pointer">
                               {{ page_number }}
                           </a>
                       </li>
                   {% else %}
                       <li class="page-item">
-                          <a class="page-link tw-cursor-pointer"
+                          <a class="page-link tw:cursor-pointer"
                              hx-get="{% url 'transactions_all_list' %}"
                              hx-vals='{"page": {{ page_number }}}'
                              hx-include="#filter, #order"
@@ -94,7 +94,7 @@
           </a>
         </li>
         <li class="page-item">
-          <a class="page-link tw-cursor-pointer"
+          <a class="page-link tw:cursor-pointer"
              hx-get="{% url 'transactions_all_list' %}" hx-target="#transactions-list"
              hx-vals='{"page": {{ page_obj.paginator.num_pages }}}'
              hx-include="#filter, #order"
@@ -105,7 +105,7 @@
         </li>
       {% endif %}
       <li class="page-item">
-        <a class="page-link {% if not page_obj.has_next %}disabled{% endif %} tw-cursor-pointer"
+        <a class="page-link {% if not page_obj.has_next %}disabled{% endif %} tw:cursor-pointer"
            hx-get="{% if page_obj.has_next %}{% url 'transactions_all_list' %}{% endif %}"
            hx-vals='{"page": {{ page_obj.paginator.num_pages }}}'
            hx-include="#filter, #order"