From 9ade58a003cc911d65c2ea210e53d88fd9dcd20d Mon Sep 17 00:00:00 2001 From: Herculino Trotta Date: Mon, 3 Nov 2025 01:40:13 -0300 Subject: [PATCH] feat: another batch --- .vscode/settings.json | 1 + .../account_groups/fragments/list.html | 15 +- app/templates/accounts/fragments/list.html | 18 +- .../calendar_view/fragments/list.html | 16 +- app/templates/categories/fragments/list.html | 3 +- app/templates/categories/fragments/table.html | 12 +- .../cotton/components/sidebar_menu_item.html | 5 +- .../components/sidebar_menu_url_item.html | 5 +- app/templates/cotton/transaction/item.html | 48 +-- .../ui/deleted_transactions_action_bar.html | 6 +- .../cotton/ui/transactions_action_bar.html | 9 +- app/templates/currencies/fragments/list.html | 9 +- .../dca/fragments/strategy/details.html | 9 +- .../dca/fragments/strategy/list.html | 15 +- app/templates/entities/fragments/list.html | 3 +- app/templates/entities/fragments/table.html | 12 +- .../exchange_rates/fragments/list.html | 3 +- .../exchange_rates/fragments/table.html | 6 +- .../fragments/list.html | 9 +- .../fragments/table.html | 6 +- .../import_app/fragments/profiles/list.html | 15 +- .../import_app/fragments/runs/list.html | 6 +- app/templates/includes/navbar.html | 7 +- app/templates/includes/offcanvas.html | 24 +- .../includes/scripts/hyperscript/tooltip.html | 13 +- app/templates/includes/sidebar.html | 3 +- .../installment_plans/fragments/list.html | 3 +- .../installment_plans/fragments/table.html | 12 +- app/templates/layouts/base.html | 142 +++---- .../mini_tools/unit_price_calculator.html | 29 +- .../monthly_overview/fragments/list.html | 4 +- .../monthly_overview/pages/overview.html | 4 +- app/templates/net_worth/net_worth.html | 301 ++++++------- .../quick_transactions/fragments/list.html | 6 +- .../quick_transactions/pages/index.html | 3 +- .../fragments/list.html | 3 +- .../fragments/table.html | 18 +- app/templates/rules/fragments/list.html | 18 +- .../fragments/transaction_rule/view.html | 15 +- app/templates/tags/fragments/list.html | 3 +- app/templates/tags/fragments/table.html | 12 +- .../transactions/fragments/list_all.html | 2 +- app/templates/users/fragments/list.html | 9 +- frontend/package-lock.json | 10 + frontend/package.json | 1 + frontend/src/bootstrap.js | 16 +- frontend/src/js/_tooltip.js | 21 + frontend/src/styles/_bootstrap.scss | 3 +- frontend/src/styles/_dropdown.scss | 402 ++++++++++++++++++ 49 files changed, 822 insertions(+), 493 deletions(-) create mode 100644 frontend/src/js/_tooltip.js create mode 100644 frontend/src/styles/_dropdown.scss diff --git a/.vscode/settings.json b/.vscode/settings.json index 1c0cfda..db09e10 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -4,4 +4,5 @@ "*.css": "tailwindcss" }, "tailwindCSS.experimental.configFile": "frontend/src/styles/tailwind.css", + "djlint.profile": "django", } \ No newline at end of file diff --git a/app/templates/account_groups/fragments/list.html b/app/templates/account_groups/fragments/list.html index 285ed62..3e09c52 100644 --- a/app/templates/account_groups/fragments/list.html +++ b/app/templates/account_groups/fragments/list.html @@ -5,8 +5,7 @@
{% translate 'Account Groups' %} @@ -32,15 +31,13 @@
{% endif %} @@ -61,8 +57,7 @@ role="button" hx-target="#generic-offcanvas" hx-swap="innerHTML" - data-bs-toggle="tooltip" - data-bs-title="{% translate "Share" %}" + data-tippy-content="{% translate "Share" %}" hx-get="{% url 'account_group_share_settings' pk=account_group.id %}"> {% endif %} diff --git a/app/templates/accounts/fragments/list.html b/app/templates/accounts/fragments/list.html index 437a03a..a673cd4 100644 --- a/app/templates/accounts/fragments/list.html +++ b/app/templates/accounts/fragments/list.html @@ -5,8 +5,7 @@
{% translate 'Accounts' %} @@ -37,15 +36,13 @@
{% endif %} @@ -66,16 +62,14 @@ role="button" hx-target="#generic-offcanvas" hx-swap="innerHTML" - data-bs-toggle="tooltip" - data-bs-title="{% translate "Share" %}" + data-tippy-content="{% translate "Share" %}" hx-get="{% url 'account_share_settings' pk=account.id %}"> {% endif %} + data-tippy-content="{% if account.is_untracked_by %}{% translate "Track" %}{% else %}{% translate "Untrack" %}{% endif %}"> {% if account.is_untracked_by %} {% else %} diff --git a/app/templates/calendar_view/fragments/list.html b/app/templates/calendar_view/fragments/list.html index d0f6c81..fba0561 100644 --- a/app/templates/calendar_view/fragments/list.html +++ b/app/templates/calendar_view/fragments/list.html @@ -39,23 +39,23 @@ {% for transaction in date.transactions %} {% if transaction.is_paid %} {% if transaction.type == "IN" and not transaction.account.is_asset %} - + {% elif transaction.type == "IN" and transaction.account.is_asset %} - + {% elif transaction.type == "EX" and not transaction.account.is_asset %} - + {% elif transaction.type == "EX" and transaction.account.is_asset %} - + {% endif %} {% else %} {% if transaction.type == "IN" and not transaction.account.is_asset %} - + {% elif transaction.type == "IN" and transaction.account.is_asset %} - + {% elif transaction.type == "EX" and not transaction.account.is_asset %} - + {% elif transaction.type == "EX" and transaction.account.is_asset %} - + {% endif %} {% endif %} {% endfor %} diff --git a/app/templates/categories/fragments/list.html b/app/templates/categories/fragments/list.html index fe8248c..e3e2a73 100644 --- a/app/templates/categories/fragments/list.html +++ b/app/templates/categories/fragments/list.html @@ -5,8 +5,7 @@
{% translate 'Categories' %} diff --git a/app/templates/categories/fragments/table.html b/app/templates/categories/fragments/table.html index 4d2ba15..dd57584 100644 --- a/app/templates/categories/fragments/table.html +++ b/app/templates/categories/fragments/table.html @@ -24,16 +24,14 @@
{% endif %} @@ -55,8 +52,7 @@ role="button" hx-target="#generic-offcanvas" hx-swap="innerHTML" - data-bs-toggle="tooltip" - data-bs-title="{% translate "Share" %}" + data-tippy-content="{% translate "Share" %}" hx-get="{% url 'category_share_settings' pk=category.id %}"> {% endif %} diff --git a/app/templates/cotton/components/sidebar_menu_item.html b/app/templates/cotton/components/sidebar_menu_item.html index dc38d2f..9dfa842 100644 --- a/app/templates/cotton/components/sidebar_menu_item.html +++ b/app/templates/cotton/components/sidebar_menu_item.html @@ -3,9 +3,8 @@ diff --git a/app/templates/cotton/transaction/item.html b/app/templates/cotton/transaction/item.html index 529efa8..2c4353b 100644 --- a/app/templates/cotton/transaction/item.html +++ b/app/templates/cotton/transaction/item.html @@ -1,7 +1,7 @@ {% load markdown %} {% load i18n %}
+ class="transaction {% if transaction.type == "EX" %}expense{% else %}income{% endif %} group/transaction relative group-hover/transaction:z-50 hover:z-50">
{% if not disable_selection or not dummy %}
{% if not dummy %} -
+
{# Item actions#}