From 89b2d0118da568599d97b2624813aa3512dac598 Mon Sep 17 00:00:00 2001
From: Herculino Trotta <netotrotta@gmail.com>
Date: Sun, 2 Nov 2025 03:03:22 -0300
Subject: [PATCH] feat: another batch of fixes

---
 app/WYGIWYH/settings.py                       |  1 +
 app/apps/accounts/forms.py                    |  4 +-
 app/apps/currencies/forms.py                  |  4 +-
 app/apps/dca/forms.py                         | 24 ++---
 app/apps/insights/forms.py                    | 12 +--
 app/apps/transactions/filters.py              |  8 +-
 app/apps/transactions/forms.py                | 88 ++++++++-----------
 app/apps/users/forms.py                       | 10 +--
 .../calendar_view/pages/calendar.html         |  4 +-
 app/templates/cotton/amount/display.html      |  2 +-
 .../cotton/components/fab_menu_button.html    |  2 +-
 .../components/sidebar_menu_header.html       |  4 +-
 .../cotton/components/sidebar_menu_item.html  |  2 +-
 .../components/sidebar_menu_url_item.html     |  2 +-
 .../cotton/ui/percentage_distribution.html    |  2 +-
 .../crispy-daisyui/layout/column.html         |  2 +-
 app/templates/includes/sidebar.html           | 11 +--
 app/templates/insights/pages/index.html       |  2 +-
 app/templates/layouts/base.html               |  2 +-
 app/templates/layouts/base_auth.html          |  2 +-
 .../mini_tools/unit_price_calculator.html     | 30 +++----
 .../monthly_overview/pages/overview.html      | 67 +++++++-------
 app/templates/net_worth/net_worth.html        | 58 ++++++------
 .../transactions/pages/transactions.html      |  2 +-
 app/templates/users/login.html                |  8 +-
 .../pages/yearly_overview_base.html           |  4 +-
 frontend/src/select.js                        | 15 +++-
 frontend/src/styles/_tom-select.scss          |  8 +-
 frontend/src/styles/tailwind.css              | 23 ++++-
 frontend/vite.config.js                       |  3 +-
 30 files changed, 208 insertions(+), 198 deletions(-)

diff --git a/app/WYGIWYH/settings.py b/app/WYGIWYH/settings.py
index 0158fa0..38d1b29 100644
--- a/app/WYGIWYH/settings.py
+++ b/app/WYGIWYH/settings.py
@@ -318,6 +318,7 @@ DJANGO_VITE_ASSETS_PATH = STATIC_ROOT
 DJANGO_VITE_MANIFEST_PATH = DJANGO_VITE_ASSETS_PATH / "manifest.json"
 DJANGO_VITE_DEV_MODE = DEBUG
 DJANGO_VITE_DEV_SERVER_PORT = 5173
+DJANGO_VITE_DEV_SERVER_HOST = "100.118.164.62"
 
 # Default primary key field type
 # https://docs.djangoproject.com/en/5.1/ref/settings/#default-auto-field
diff --git a/app/apps/accounts/forms.py b/app/apps/accounts/forms.py
index 8d33603..c67da67 100644
--- a/app/apps/accounts/forms.py
+++ b/app/apps/accounts/forms.py
@@ -154,8 +154,8 @@ class AccountBalanceForm(forms.Form):
         self.helper.layout = Layout(
             "new_balance",
             Row(
-                Column("category", css_class="md:col-span-6 mb-0"),
-                Column("tags", css_class="md:col-span-6 mb-0"),
+                Column("category"),
+                Column("tags"),
                 css_class="form-row",
             ),
             Field("account_id"),
diff --git a/app/apps/currencies/forms.py b/app/apps/currencies/forms.py
index 0c9a732..1ef5c26 100644
--- a/app/apps/currencies/forms.py
+++ b/app/apps/currencies/forms.py
@@ -131,8 +131,8 @@ class ExchangeRateServiceForm(forms.ModelForm):
             Switch("singleton"),
             "api_key",
             Row(
-                Column("interval_type", css_class="md:col-span-6"),
-                Column("fetch_interval", css_class="md:col-span-6"),
+                Column("interval_type"),
+                Column("fetch_interval"),
             ),
             "target_currencies",
             "target_accounts",
diff --git a/app/apps/dca/forms.py b/app/apps/dca/forms.py
index 1e6d6e0..939aa39 100644
--- a/app/apps/dca/forms.py
+++ b/app/apps/dca/forms.py
@@ -34,8 +34,8 @@ class DCAStrategyForm(forms.ModelForm):
         self.helper.layout = Layout(
             "name",
             Row(
-                Column("payment_currency", css_class="md:col-span-6"),
-                Column("target_currency", css_class="md:col-span-6"),
+                Column("payment_currency"),
+                Column("target_currency"),
             ),
             "notes",
         )
@@ -153,8 +153,8 @@ class DCAEntryForm(forms.ModelForm):
         self.helper.layout = Layout(
             "date",
             Row(
-                Column("amount_paid", css_class="md:col-span-6"),
-                Column("amount_received", css_class="md:col-span-6"),
+                Column("amount_paid"),
+                Column("amount_received"),
             ),
             "notes",
             BS5Accordion(
@@ -166,17 +166,11 @@ class DCAEntryForm(forms.ModelForm):
                             Row(
                                 Column(
                                     "from_account",
-                                    css_class="form-group",
                                 ),
-                                css_class="form-row",
                             ),
                             Row(
-                                Column(
-                                    "from_category",
-                                    css_class="md:col-span-6 mb-0",
-                                ),
-                                Column("from_tags", css_class="md:col-span-6 mb-0"),
-                                css_class="form-row",
+                                Column("from_category"),
+                                Column("from_tags"),
                             ),
                         ),
                         css_class="p-1 mx-1 my-3 border rounded-3",
@@ -188,12 +182,10 @@ class DCAEntryForm(forms.ModelForm):
                                     "to_account",
                                     css_class="form-group",
                                 ),
-                                css_class="form-row",
                             ),
                             Row(
-                                Column("to_category", css_class="md:col-span-6 mb-0"),
-                                Column("to_tags", css_class="md:col-span-6 mb-0"),
-                                css_class="form-row",
+                                Column("to_category"),
+                                Column("to_tags"),
                             ),
                         ),
                         css_class="p-1 mx-1 my-3 border rounded-3",
diff --git a/app/apps/insights/forms.py b/app/apps/insights/forms.py
index ab23b7b..0414149 100644
--- a/app/apps/insights/forms.py
+++ b/app/apps/insights/forms.py
@@ -58,8 +58,8 @@ class MonthRangeForm(forms.Form):
 
         self.helper.layout = Layout(
             Row(
-                Column("month_from", css_class="md:col-span-6"),
-                Column("month_to", css_class="md:col-span-6"),
+                Column("month_from"),
+                Column("month_to"),
             ),
         )
 
@@ -81,8 +81,8 @@ class YearRangeForm(forms.Form):
 
         self.helper.layout = Layout(
             Row(
-                Column("year_from", css_class="md:col-span-6"),
-                Column("year_to", css_class="md:col-span-6"),
+                Column("year_from"),
+                Column("year_to"),
             ),
         )
 
@@ -104,8 +104,8 @@ class DateRangeForm(forms.Form):
 
         self.helper.layout = Layout(
             Row(
-                Column("date_from", css_class="md:col-span-6"),
-                Column("date_to", css_class="md:col-span-6"),
+                Column("date_from"),
+                Column("date_to"),
                 css_class="mb-0",
             ),
         )
diff --git a/app/apps/transactions/filters.py b/app/apps/transactions/filters.py
index 2110223..e28f4af 100644
--- a/app/apps/transactions/filters.py
+++ b/app/apps/transactions/filters.py
@@ -158,13 +158,13 @@ class TransactionsFilter(django_filters.FilterSet):
             Field("description"),
             Row(Column("date_start"), Column("date_end")),
             Row(
-                Column("reference_date_start", css_class="md:col-span-6 mb-0"),
-                Column("reference_date_end", css_class="md:col-span-6 mb-0"),
+                Column("reference_date_start"),
+                Column("reference_date_end"),
                 css_class="form-row",
             ),
             Row(
-                Column("from_amount", css_class="md:col-span-6 mb-0"),
-                Column("to_amount", css_class="md:col-span-6 mb-0"),
+                Column("from_amount"),
+                Column("to_amount"),
                 css_class="form-row",
             ),
             Field("account", size=1),
diff --git a/app/apps/transactions/forms.py b/app/apps/transactions/forms.py
index 7503d78..f240594 100644
--- a/app/apps/transactions/forms.py
+++ b/app/apps/transactions/forms.py
@@ -133,20 +133,20 @@ class TransactionForm(forms.ModelForm):
             ),
             Field("is_paid", template="transactions/widgets/paid_toggle_button.html"),
             Row(
-                Column("account", css_class="md:col-span-6 mb-0"),
-                Column("entities", css_class="md:col-span-6 mb-0"),
+                Column("account"),
+                Column("entities"),
                 css_class="form-row",
             ),
             Row(
-                Column(Field("date"), css_class="md:col-span-6 mb-0"),
-                Column(Field("reference_date"), css_class="md:col-span-6 mb-0"),
+                Column(Field("date")),
+                Column(Field("reference_date")),
                 css_class="form-row",
             ),
             "description",
             Field("amount", inputmode="decimal"),
             Row(
-                Column("category", css_class="md:col-span-6 mb-0"),
-                Column("tags", css_class="md:col-span-6 mb-0"),
+                Column("category"),
+                Column("tags"),
                 css_class="form-row",
             ),
             "notes",
@@ -163,8 +163,8 @@ class TransactionForm(forms.ModelForm):
             Field("is_paid", template="transactions/widgets/paid_toggle_button.html"),
             "account",
             Row(
-                Column(Field("date"), css_class="md:col-span-6 mb-0"),
-                Column(Field("reference_date"), css_class="md:col-span-6 mb-0"),
+                Column(Field("date")),
+                Column(Field("reference_date")),
                 css_class="form-row",
             ),
             "description",
@@ -174,8 +174,8 @@ class TransactionForm(forms.ModelForm):
                     _("More"),
                     "entities",
                     Row(
-                        Column("category", css_class="md:col-span-6 mb-0"),
-                        Column("tags", css_class="md:col-span-6 mb-0"),
+                        Column("category"),
+                        Column("tags"),
                         css_class="form-row",
                     ),
                     "notes",
@@ -349,15 +349,15 @@ class QuickTransactionForm(forms.ModelForm):
             "name",
             HTML("<hr />"),
             Row(
-                Column("account", css_class="md:col-span-6 mb-0"),
-                Column("entities", css_class="md:col-span-6 mb-0"),
+                Column("account"),
+                Column("entities"),
                 css_class="form-row",
             ),
             "description",
             Field("amount", inputmode="decimal"),
             Row(
-                Column("category", css_class="md:col-span-6 mb-0"),
-                Column("tags", css_class="md:col-span-6 mb-0"),
+                Column("category"),
+                Column("tags"),
                 css_class="form-row",
             ),
             "notes",
@@ -480,20 +480,20 @@ class BulkEditTransactionForm(forms.Form):
                 template="transactions/widgets/unselectable_paid_toggle_button.html",
             ),
             Row(
-                Column("account", css_class="md:col-span-6 mb-0"),
-                Column("entities", css_class="md:col-span-6 mb-0"),
+                Column("account"),
+                Column("entities"),
                 css_class="form-row",
             ),
             Row(
-                Column(Field("date"), css_class="md:col-span-6 mb-0"),
-                Column(Field("reference_date"), css_class="md:col-span-6 mb-0"),
+                Column(Field("date")),
+                Column(Field("reference_date")),
                 css_class="form-row",
             ),
             "description",
             Field("amount", inputmode="decimal"),
             Row(
-                Column("category", css_class="md:col-span-6 mb-0"),
-                Column("tags", css_class="md:col-span-6 mb-0"),
+                Column("category"),
+                Column("tags"),
                 css_class="form-row",
             ),
             "notes",
@@ -599,40 +599,30 @@ class TransferForm(forms.Form):
 
         self.helper.layout = Layout(
             Row(
-                Column(Field("date"), css_class="md:col-span-6 mb-0"),
+                Column(Field("date")),
                 Column(
                     Field("reference_date"),
-                    css_class="md:col-span-6 mb-0",
                 ),
-                css_class="form-row",
             ),
             Field("description"),
             Field("notes"),
             Switch("mute"),
             Row(
-                Column(
-                    "from_account",
-                    css_class="md:col-span-6",
-                ),
-                Column(
-                    Field("from_amount"),
-                    css_class="md:col-span-6",
-                ),
-                Column("from_category", css_class="md:col-span-6"),
-                Column("from_tags", css_class="md:col-span-6"),
+                Column("from_account"),
+                Column(Field("from_amount")),
+                Column("from_category"),
+                Column("from_tags"),
                 css_class="bg-base-200 rounded-box p-4 border-base-content/60 border mb-3",
             ),
             Row(
                 Column(
                     "to_account",
-                    css_class="md:col-span-6 mb-0",
                 ),
                 Column(
                     Field("to_amount"),
-                    css_class="md:col-span-6 mb-0",
                 ),
-                Column("to_category", css_class="md:col-span-6 mb-0"),
-                Column("to_tags", css_class="md:col-span-6 mb-0"),
+                Column("to_category"),
+                Column("to_tags"),
                 css_class="bg-base-200 rounded-box p-4 border-base-content/60 border mb-3",
             ),
             FormActions(
@@ -824,8 +814,8 @@ class InstallmentPlanForm(forms.ModelForm):
                 template="transactions/widgets/income_expense_toggle_buttons.html",
             ),
             Row(
-                Column("account", css_class="md:col-span-6 mb-0"),
-                Column("entities", css_class="md:col-span-6 mb-0"),
+                Column("account"),
+                Column("entities"),
                 css_class="form-row",
             ),
             "description",
@@ -833,8 +823,8 @@ class InstallmentPlanForm(forms.ModelForm):
             "notes",
             Switch("add_notes_to_transaction"),
             Row(
-                Column("number_of_installments", css_class="md:col-span-6 mb-0"),
-                Column("installment_start", css_class="md:col-span-6 mb-0"),
+                Column("number_of_installments"),
+                Column("installment_start"),
                 css_class="form-row",
             ),
             Row(
@@ -845,8 +835,8 @@ class InstallmentPlanForm(forms.ModelForm):
             ),
             "installment_amount",
             Row(
-                Column("category", css_class="md:col-span-6 mb-0"),
-                Column("tags", css_class="md:col-span-6 mb-0"),
+                Column("category"),
+                Column("tags"),
                 css_class="form-row",
             ),
         )
@@ -1086,23 +1076,23 @@ class RecurringTransactionForm(forms.ModelForm):
                 template="transactions/widgets/income_expense_toggle_buttons.html",
             ),
             Row(
-                Column("account", css_class="md:col-span-6 mb-0"),
-                Column("entities", css_class="md:col-span-6 mb-0"),
+                Column("account"),
+                Column("entities"),
                 css_class="form-row",
             ),
             "description",
             Switch("add_description_to_transaction"),
             "amount",
             Row(
-                Column("category", css_class="md:col-span-6 mb-0"),
-                Column("tags", css_class="md:col-span-6 mb-0"),
+                Column("category"),
+                Column("tags"),
                 css_class="form-row",
             ),
             "notes",
             Switch("add_notes_to_transaction"),
             Row(
-                Column("start_date", css_class="md:col-span-6 mb-0"),
-                Column("reference_date", css_class="md:col-span-6 mb-0"),
+                Column("start_date"),
+                Column("reference_date"),
                 css_class="form-row",
             ),
             Row(
diff --git a/app/apps/users/forms.py b/app/apps/users/forms.py
index 3f05051..bb3aec6 100644
--- a/app/apps/users/forms.py
+++ b/app/apps/users/forms.py
@@ -53,7 +53,7 @@ class LoginForm(AuthenticationForm):
         self.helper.layout = Layout(
             "username",
             "password",
-            Submit("Submit", "Login", css_class="btn btn-primary w-100"),
+            Submit("Submit", "Login", css_class="w-full mt-3"),
         )
 
 
@@ -199,8 +199,8 @@ class UserUpdateForm(forms.ModelForm):
         # Define the layout using Crispy Forms, including the new fields
         self.helper.layout = Layout(
             Row(
-                Column("first_name", css_class="md:col-span-6"),
-                Column("last_name", css_class="md:col-span-6"),
+                Column("first_name"),
+                Column("last_name"),
                 css_class="row",
             ),
             Field("email"),
@@ -362,8 +362,8 @@ class UserAddForm(UserCreationForm):
         self.helper.layout = Layout(
             Field("email"),
             Row(
-                Column("first_name", css_class="md:col-span-6"),
-                Column("last_name", css_class="md:col-span-6"),
+                Column("first_name"),
+                Column("last_name"),
                 css_class="row",
             ),
             # UserCreationForm provides 'password1' and 'password2' fields
diff --git a/app/templates/calendar_view/pages/calendar.html b/app/templates/calendar_view/pages/calendar.html
index b7ce09d..8868fcc 100644
--- a/app/templates/calendar_view/pages/calendar.html
+++ b/app/templates/calendar_view/pages/calendar.html
@@ -12,7 +12,7 @@
 {% endblock %}
 
 {% block content %}
-  <div class="container px-md-3 py-3 gap-x-5">
+  <div class="container px-md-3 py-3 gap-x-5 overflow-x-hidden">
     <div class="flex flex-wrap mb-4 gap-x-xl-4 gap-y-3">
       {#    Date picker#}
       <div class="w-full xl:w-4/12 flex-row items-center flex">
@@ -24,7 +24,7 @@
               <i class="fa-solid fa-chevron-left"></i>
             </a>
         </div>
-        <div class="text-3xl font-bold font-mono w-full text-center btn btn-ghost"
+        <div class="text-2xl font-bold btn btn-ghost flex-1 text-center whitespace-normal flex-wrap h-auto min-w-0"
              hx-get="{% url 'month_year_picker' %}"
              hx-target="#generic-offcanvas-left"
              hx-trigger="click, date_picker from:window"
diff --git a/app/templates/cotton/amount/display.html b/app/templates/cotton/amount/display.html
index 39436c4..1607424 100644
--- a/app/templates/cotton/amount/display.html
+++ b/app/templates/cotton/amount/display.html
@@ -3,7 +3,7 @@
 {% 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" %} text-base-content/70{% elif color == 'green' %} text-success {% elif color == 'red' %} text-error{% endif %} {{ custom_class }}"
+  <span class="amount{% if color == 'grey' or color == "gray" %} text-base-content/50{% elif color == 'green' %} text-success {% elif color == 'red' %} text-error{% endif %} font-medium {{ 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>
diff --git a/app/templates/cotton/components/fab_menu_button.html b/app/templates/cotton/components/fab_menu_button.html
index 0234c45..959c824 100644
--- a/app/templates/cotton/components/fab_menu_button.html
+++ b/app/templates/cotton/components/fab_menu_button.html
@@ -2,5 +2,5 @@
       hx-trigger="{{ hx_trigger }}"
       hx-target="{{ hx_target }}"
       hx-vals='{{ hx_vals }}'>
-      {{ title }}
+      <span class="bg-neutral/60 text-neutral-content rounded-box p-2">{{ title }}</span>
       <button class="btn btn-lg btn-circle btn-{{color}}"><i class="{{ icon }} fa-fw"></i></button></div>
\ No newline at end of file
diff --git a/app/templates/cotton/components/sidebar_menu_header.html b/app/templates/cotton/components/sidebar_menu_header.html
index df51ecd..4212855 100644
--- a/app/templates/cotton/components/sidebar_menu_header.html
+++ b/app/templates/cotton/components/sidebar_menu_header.html
@@ -1,6 +1,6 @@
 <li>
-  <div class="flex items-center">
+  <div class="flex items-center min-h-[1.25rem]">
     <span class="sidebar-menu-header text-base-content/60 text-sm font-bold uppercase mr-3">{{ title }}</span>
-    <hr class="hr flex-grow"/>
+    <hr class="hr grow"/>
   </div>
 </li>
diff --git a/app/templates/cotton/components/sidebar_menu_item.html b/app/templates/cotton/components/sidebar_menu_item.html
index 8ea2836..dc38d2f 100644
--- a/app/templates/cotton/components/sidebar_menu_item.html
+++ b/app/templates/cotton/components/sidebar_menu_item.html
@@ -9,6 +9,6 @@
       {% endif %}>
     <i class="{{ icon }} fa-fw"></i>
     <span
-        class="ms-3 font-medium lg:group-hover:truncate lg:group-focus:truncate lg:group-hover:text-ellipsis lg:group-focus:text-ellipsis">{{ title }}</span>
+        class="ms-3 font-medium">{{ title }}</span>
   </a>
 </li>
diff --git a/app/templates/cotton/components/sidebar_menu_url_item.html b/app/templates/cotton/components/sidebar_menu_url_item.html
index 36d1a62..e7e6751 100644
--- a/app/templates/cotton/components/sidebar_menu_url_item.html
+++ b/app/templates/cotton/components/sidebar_menu_url_item.html
@@ -11,6 +11,6 @@
 
     <i class="{{ icon }} fa-fw"></i>
     <span
-        class="ms-3 font-medium lg:group-hover:truncate lg:group-focus:truncate lg:group-hover:text-ellipsis lg:group-focus:text-ellipsis">{{ title }}</span>
+        class="ms-3 font-medium">{{ title }}</span>
   </a>
 </li>
diff --git a/app/templates/cotton/ui/percentage_distribution.html b/app/templates/cotton/ui/percentage_distribution.html
index e192212..e1d20e8 100644
--- a/app/templates/cotton/ui/percentage_distribution.html
+++ b/app/templates/cotton/ui/percentage_distribution.html
@@ -1,5 +1,5 @@
 {% load i18n %}
-<div class="flex w-full h-4 rounded-full bg-white"
+<div class="flex w-full h-4 rounded-full bg-white overflow-hidden"
     role="group"
     aria-label="{% trans 'Income and Expense Percentages' %}">
     
diff --git a/app/templates/crispy-daisyui/layout/column.html b/app/templates/crispy-daisyui/layout/column.html
index 5c2da10..86b3a8e 100644
--- a/app/templates/crispy-daisyui/layout/column.html
+++ b/app/templates/crispy-daisyui/layout/column.html
@@ -1,5 +1,5 @@
 <div {% if div.css_id %}id="{{ div.css_id }}"{% endif %}
-     class="{% if 'col' in div.css_class %}{{ div.css_class|default:'' }}{% else %}md:col-span-6 {{ div.css_class|default:'' }}{% endif %}" {{ div.flat_attrs }}>
+     class="{% if 'col' in div.css_class %}{{ div.css_class|default:'' }}{% else %}md:col-span-6 col-span-12{{ div.css_class|default:'' }}{% endif %}" {{ div.flat_attrs }}>
         {{ fields|safe }}
 </div>
 
diff --git a/app/templates/includes/sidebar.html b/app/templates/includes/sidebar.html
index a4a93db..b135a50 100644
--- a/app/templates/includes/sidebar.html
+++ b/app/templates/includes/sidebar.html
@@ -11,6 +11,7 @@
       id="sidebar"
       hx-boost="true"
       hx-swap="transition:true"
+      data-bs-scroll="true"
       class="offcanvas-lg offcanvas-start lg:flex flex-col fixed top-0 left-0 h-full bg-base-300! shadow-sm z-[1045]">
     <div data-theme="wygiwyh_dark" class="hidden lg:flex items-center justify-between pr-4 border-b border-base-content/10 sidebar-submenu-header bg-base-300">
       <a href="{% url 'index' %}" class="m-0 hidden lg:flex justify-start p-3 no-underline sidebar-title">
@@ -24,7 +25,7 @@
           hx-get="{% url 'toggle_sidebar_status' %}"
           _="on click
            toggle .sidebar-floating on #sidebar-container
-           toggle .tw\:group on #sidebar-container
+           toggle .group on #sidebar-container
            toggle .sidebar-fixed on #sidebar-container
         end
       "
@@ -44,7 +45,7 @@
     </div>
     <hr class="m-0 hr">
 
-    <ul class="list-none p-3 flex flex-col gap-1 whitespace-nowrap lg:group-hover:animate-[disable-pointer-events]"
+    <ul class="list-none p-3 flex flex-col gap-1 whitespace-nowrap lg:group-hover:animate-[disable-pointer-events] overflow-y-auto overflow-x-hidden"
         style="animation-duration: 100ms">
 
       <c-components.sidebar-menu-item
@@ -142,7 +143,7 @@
            data-bs-target="#collapsible-panel"
            aria-expanded="false"
            aria-controls="collapsible-panel"
-           class="sidebar-menu-item text-wrap lg:text-nowrap lg:text-sm flex items-center no-underline p-2 rounded-2xl cursor-pointer sidebar-item {% active_link views='tags_index||entities_index||categories_index||accounts_index||account_groups_index||currencies_index||exchange_rates_index||rules_index||import_profiles_index||automatic_exchange_rates_index||export_index||users_index' css_class="sidebar-active" %}">
+           class="sidebar-item text-wrap lg:text-nowrap lg:text-sm flex items-center no-underline p-2 cursor-pointer sidebar-item {% active_link views='tags_index||entities_index||categories_index||accounts_index||account_groups_index||currencies_index||exchange_rates_index||rules_index||import_profiles_index||automatic_exchange_rates_index||export_index||users_index' css_class="sidebar-active" %}">
         <i class="fa-solid fa-toolbox fa-fw"></i>
         <span class="ml-3 font-medium lg:group-hover:truncate lg:group-focus:truncate lg:group-hover:text-ellipsis lg:group-focus:text-ellipsis">
           {% translate 'Management' %}
@@ -154,7 +155,7 @@
     <div class="mt-auto p-2 w-full">
       <div id="collapsible-panel"
            class="p-0 collapse absolute bottom-0 left-0 w-full z-30 max-h-dvh {% active_link views='tags_index||entities_index||categories_index||accounts_index||account_groups_index||currencies_index||exchange_rates_index||rules_index||import_profiles_index||automatic_exchange_rates_index||export_index||users_index' css_class="show" %}">
-        <div class="h-dvh backdrop-blur-3xl flex flex-col">
+        <div class="h-dvh bg-base-300 flex flex-col">
           <div
               class="justify-between items-center p-4 border-b border-base-content/10 sidebar-submenu-header text-base-content">
             <h5 class="text-lg font-semibold text-base-content m-0">
@@ -170,7 +171,7 @@
             </button>
           </div>
 
-          <ul class="list-none p-3 flex flex-col gap-2 lg:group-hover:animate-[disable-pointer-events] flex-1"
+          <ul class="list-none p-3 flex flex-col gap-2 lg:group-hover:animate-[disable-pointer-events] flex-1 overflow-y-auto overflow-x-hidden"
               style="animation-duration: 100ms">
             <c-components.sidebar-menu-header title="{% translate 'Transactions' %}"></c-components.sidebar-menu-header>
             <c-components.sidebar-menu-item
diff --git a/app/templates/insights/pages/index.html b/app/templates/insights/pages/index.html
index 476db56..176829b 100644
--- a/app/templates/insights/pages/index.html
+++ b/app/templates/insights/pages/index.html
@@ -13,7 +13,7 @@
             <div class="mb-2 w-full lg:inline-flex grid gap-2 flex-wrap lg:justify-center" role="group"
                  _="on change
                     set type to event.target.value
-                    add .hidden to <#picker-form > div:not(.tw\\:hidden)/>
+                    add .hidden to <#picker-form > div:not(.hidden)/>
 
                     if type == 'month'
                       remove .hidden from #month-form
diff --git a/app/templates/layouts/base.html b/app/templates/layouts/base.html
index 6a32647..d1a9ebd 100644
--- a/app/templates/layouts/base.html
+++ b/app/templates/layouts/base.html
@@ -58,7 +58,7 @@
   {% include 'includes/mobile_navbar.html' %}
   {% include 'includes/sidebar.html' %}
 
-  <main class="p-4">
+  <main>
     {% settings "DEMO" as demo_mode %}
     {% if demo_mode %}
     <div class="px-3 m-0" id="demo-mode-alert" hx-preserve>
diff --git a/app/templates/layouts/base_auth.html b/app/templates/layouts/base_auth.html
index 63e15e7..8ae2a73 100644
--- a/app/templates/layouts/base_auth.html
+++ b/app/templates/layouts/base_auth.html
@@ -1,7 +1,7 @@
 {% load pwa %}
 {% load title %}
 <!doctype html>
-<html lang="en" data-bs-theme="dark">
+<html lang="en" data-theme="wygiwyh_dark">
   <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
diff --git a/app/templates/mini_tools/unit_price_calculator.html b/app/templates/mini_tools/unit_price_calculator.html
index d002c62..b328558 100644
--- a/app/templates/mini_tools/unit_price_calculator.html
+++ b/app/templates/mini_tools/unit_price_calculator.html
@@ -15,7 +15,7 @@
                 role="button"
                 data-bs-toggle="tooltip"
                 data-bs-title="{% translate "Delete" %}"
-                _="on click remove the closest .tw\:card to me then trigger update on #items then call bootstrap.Tooltip.getOrCreateInstance(me).dispose()">
+                _="on click remove the closest .card to me then trigger update on #items then call bootstrap.Tooltip.getOrCreateInstance(me).dispose()">
           <i class="fa-solid fa-trash fa-fw"></i>
         </button>
       </div>
@@ -41,7 +41,7 @@
       </div>
     </div>
     <div id="items" _="on input or update
-                      for card in <tw\\:card />
+                      for card in <.card />
                         set price to card.querySelector('.item-price').value
                         set amount to card.querySelector('.item-amount').value
 
@@ -57,15 +57,15 @@
 
                       // Remove existing highlight classes from all unit prices
                       for unitPriceEl in <.unit-price/>
-                        remove .tw\:bg-error from the closest .tw\\:card to unitPriceEl
-                        remove .tw\:bg-error from unitPriceEl's classList
-                        remove .tw\:bg-success from the closest .tw\\:card to unitPriceEl
-                        remove .tw\:bg-success from unitPriceEl's classList
+                        remove .bg-error from the closest .card to unitPriceEl
+                        remove .bg-error from unitPriceEl's classList
+                        remove .bg-success from the closest .card to unitPriceEl
+                        remove .bg-success from unitPriceEl's classList
                       end
 
                       // Get all unit prices and find min/max
-                      set unitPrices to <.tw\:card\:not(#card-placeholder) .unit-price/>
-                      set unitPricesAmounts to <.tw\:card\:not(#card-placeholder) .unit-price/> @data-amount
+                      set unitPrices to <card:not(#card-placeholder) .unit-price/>
+                      set unitPricesAmounts to <.tw:card:not(#card-placeholder) .unit-price/> @data-amount
                       js(unitPricesAmounts)
                         unitPricesAmounts = unitPricesAmounts.filter(element => element !== '0')
                         return Math.min(...unitPricesAmounts)
@@ -81,13 +81,13 @@
                         for unitPriceEl in unitPrices
                           set amount to parseFloat(unitPriceEl.getAttribute('data-amount'))
                           if amount == minAmount
-                            add .tw\:bg-success to the closest .tw\:card to unitPriceEl
-                            add .tw\:bg-opacity-20 to the closest .tw\:card to unitPriceEl
+                            add .bg-success to the closest .card to unitPriceEl
+                            add .bg-opacity-20 to the closest .card to unitPriceEl
                             continue
                           end
                           if amount == maxAmount
-                            add .tw\:bg-error to the closest .tw\:card to unitPriceEl
-                            add .tw\:bg-opacity-20 to the closest .tw\:card to unitPriceEl
+                            add .bg-error to the closest .card to unitPriceEl
+                            add .bg-opacity-20 to the closest .card to unitPriceEl
                           end
                         end
                       end
@@ -151,8 +151,8 @@
                 get #card-placeholder
                 set newCard to it.cloneNode(true)
                 remove @id from newCard
-                remove .tw\:hidden from newCard then
-                set itemCount to <#items [class='card'] />'s length
+                remove .hidden from newCard then
+                set itemCount to <#items[class='card'] />'s length
                 if itemCount < 26
                   set letter to String.fromCharCode(65 + itemCount)
                 else
@@ -169,7 +169,7 @@
         <button class="btn btn-outline btn-error w-full"
                 _="on click
                     for el in <.item-price, .item-amount />
-                      set card to the closest .\card to el
+                      set card to the closest .card to el
                       set el's value to ''
                      end
                      trigger update on #items
diff --git a/app/templates/monthly_overview/pages/overview.html b/app/templates/monthly_overview/pages/overview.html
index 02f710c..7fc77c2 100644
--- a/app/templates/monthly_overview/pages/overview.html
+++ b/app/templates/monthly_overview/pages/overview.html
@@ -12,45 +12,40 @@
 {% endblock %}
 
 {% block content %}
-  <div class="container px-3 md:px-3 py-3 gap-5">
-    <div class="grid grid-cols-1 xl:grid-cols-12 gap-x-4 gap-y-3 mb-4">
-      {#    Date picker#}
-      <div class="col-span-1 xl:col-span-4 flex flex-row items-center">
-        <div class="text-base h-full flex items-center btn btn-ghost">
-          <a role="button"
-             hx-boost="true"
-             hx-trigger="click, previous_month from:window"
-             href="{% url 'monthly_overview' month=previous_month year=previous_year %}"><i
-              class="fa-solid fa-chevron-left"></i></a>
-        </div>
-        <div class="text-3xl font-bold btn btn-ghost 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": "monthly_overview", "field": "reference_date"}'
-             role="button">
-          {{ month|month_name }} {{ year }}
-        </div>
-        <div class="text-base h-full flex items-center btn btn-ghost">
-          <a role="button"
-             hx-boost="true"
-             hx-trigger="click, next_month from:window"
-             href="{% url 'monthly_overview' month=next_month year=next_year %}">
-            <i class="fa-solid fa-chevron-right"></i>
-          </a>
+  <div class="container gap-y-3">
+    <div class="row ">
+      <div class="col-12 lg:col-4">
+        {#    Date picker#}
+        <div class="col-span-1 xl:col-span-4 flex flex-row items-center">
+          <div class="text-base h-full flex items-center btn btn-ghost">
+            <a role="button"
+              hx-boost="true"
+              hx-trigger="click, previous_month from:window"
+              href="{% url 'monthly_overview' month=previous_month year=previous_year %}"><i
+                class="fa-solid fa-chevron-left"></i></a>
+          </div>
+          <div class="text-2xl font-bold btn btn-ghost flex-1 text-center whitespace-normal flex-wrap h-auto min-w-0"
+              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": "monthly_overview", "field": "reference_date"}'
+              role="button">
+            {{ month|month_name }} {{ year }}
+          </div>
+          <div class="text-base h-full flex items-center btn btn-ghost">
+            <a role="button"
+              hx-boost="true"
+              hx-trigger="click, next_month from:window"
+              href="{% url 'monthly_overview' month=next_month year=next_year %}">
+              <i class="fa-solid fa-chevron-right"></i>
+            </a>
+          </div>
         </div>
       </div>
-      {#    Action buttons#}
-      {#      <div class="col-12 col-xl-8">#}
-      {#        <c-ui.quick-transactions-buttons#}
-      {#            :year="year"#}
-      {#            :month="month"#}
-      {#        ></c-ui.quick-transactions-buttons>#}
-      {#      </div>#}
     </div>
     {#  Monthly summary#}
-    <div class="grid grid-cols-1 xl:grid-cols-12 gap-x-4 gap-y-3">
-      <div class="col-span-1 xl:col-span-4 lg:order-last! order-first!">
+    <div class="row gap-y-3">
+      <div class="col-12 lg:col-4 lg:order-last! order-first!">
         <div role="tablist" class="tabs tabs-border">
           <input type="radio" name="monthly_summary_tabs" class="tab" aria-label="{% trans 'Summary' %}"
                  role="tab"
@@ -93,7 +88,7 @@
         </div>
 
       </div>
-      <div class="col-span-1 xl:col-span-8 lg:order-first! order-last!">
+      <div class="col-12 lg:col-8 lg:order-first! order-last!">
 
         <div class="my-3">
           {# Hidden select to hold the order value and preserve the original update trigger #}
diff --git a/app/templates/net_worth/net_worth.html b/app/templates/net_worth/net_worth.html
index 7a49b40..ffd2294 100644
--- a/app/templates/net_worth/net_worth.html
+++ b/app/templates/net_worth/net_worth.html
@@ -31,9 +31,8 @@
     </div>
     <div class="container px-md-3 py-3"
          _="init call initializeAccountChart() then initializeCurrencyChart() then initializeMonthlyDifferenceChart() end">
-      <div class="flex flex-wrap gap-x-xl-4 gap-y-3 mb-4">
-        <div class="w-full xl:w-5/12">
-          <div class="grid grid-cols-1 gap-4">
+      <div class="row gap-y-3">
+        <div class="col lg:col-5">
             <div>
               <c-ui.info-card color="yellow" icon="fa-solid fa-coins" title="{% trans 'By currency' %}"
                               title_css_classes="cursor-pointer"
@@ -41,7 +40,7 @@
                 {% for currency in currency_net_worth.values %}
                   <div class="flex justify-between mt-2">
                     <div class="flex items-baseline w-full">
-                      <div class="currency-name text-start font-mono text-base-content/60 cursor-pointer"
+                      <div class="currency-name text-start font-mono text-base-content cursor-pointer"
                            _="on click showOnlyCurrencyDataset('{{ currency.currency.name }}')">
                         {{ currency.currency.name }}
                       </div>
@@ -87,30 +86,32 @@
                 {% endfor %}
               </c-ui.info-card>
             </div>
-          </div>
         </div>
-        <div class="w-full xl:w-7/12">
-          <div role="tablist" class="tabs tabs-bordered w-full" id="myTab">
-            <input type="radio" name="networth_tabs" role="tab" class="tab" aria-label="{% trans 'Evolution' %}" id="tab-evolution" checked="checked" />
-            <div role="tabpanel" class="tab-content p-4" id="evolution-tab-pane">
-              <div class="chart-container relative min-h-[40vh] h-full w-full">
-                <canvas id="currencyBalanceChart"></canvas>
-              </div>
-            </div>
+        <div class="col lg:col-7">
+          <div class="card bg-base-100">
+            <div class="card-body">
+              <div role="tablist" class="tabs tabs-border w-full" id="myTab">
+                <input type="radio" name="networth_tabs" role="tab" class="tab" aria-label="{% trans 'Evolution' %}" id="tab-evolution" checked="checked" />
+                <div role="tabpanel" class="tab-content p-4" id="evolution-tab-pane">
+                  <div class="chart-container relative min-h-[40vh] h-full w-full">
+                    <canvas id="currencyBalanceChart"></canvas>
+                  </div>
+                </div>
 
-            <input type="radio" name="networth_tabs" role="tab" class="tab" aria-label="{% trans 'Difference' %}" id="tab-diff" />
-            <div role="tabpanel" class="tab-content p-4" id="diff-tab-pane">
-              <div class="chart-container relative min-h-[40vh] h-full w-full">
-                <canvas id="monthlyDifferenceChart"></canvas>
+                <input type="radio" name="networth_tabs" role="tab" class="tab" aria-label="{% trans 'Difference' %}" id="tab-diff" />
+                <div role="tabpanel" class="tab-content p-4" id="diff-tab-pane">
+                  <div class="chart-container relative min-h-[40vh] h-full w-full">
+                    <canvas id="monthlyDifferenceChart"></canvas>
+                  </div>
+                </div>
               </div>
             </div>
           </div>
         </div>
       </div>
-      <hr class="text-base-content/60">
-      <div class="flex flex-wrap gap-x-xl-4 gap-y-3 mt-4">
-        <div class="w-full xl:w-5/12">
-          <div class="grid grid-cols-1 gap-4">
+      <hr class="hr my-6">
+      <div class="row gap-y-3">
+        <div class="col lg:col-5">
             <div>
               <c-ui.info-card color="blue" icon="fa-solid fa-wallet" title="{% trans 'By account' %}"
                               title_css_classes="cursor-pointer"
@@ -120,14 +121,14 @@
                   {% if data.grouper %}
                     <div class="flex justify-between mt-2">
                       <div class="flex items-baseline w-full">
-                        <div class="text-start font-mono text-base-content/60"><span class="badge badge-primary">
+                        <div class="text-start font-mono text-base-content"><span class="badge badge-primary">
                         {{ data.grouper }}</span></div>
                       </div>
                     </div>
                     {% for account in data.list %}
                       <div class="flex justify-between mt-2">
                         <div class="flex items-baseline w-full">
-                          <div class="account-name text-start font-mono text-base-content/60 cursor-pointer"
+                          <div class="account-name text-start font-mono text-base-content cursor-pointer"
                                _="on click showOnlyAccountDataset('{{ account.account.name }}')">
                             <span class="hierarchy-line-icon"></span>{{ account.account.name }}</div>
                           <div class="dotted-line flex-grow"></div>
@@ -155,7 +156,7 @@
                     {% for account in data.list %}
                       <div class="flex justify-between mt-2">
                         <div class="flex items-baseline w-full">
-                          <div class="account-name text-start font-mono text-base-content/60 cursor-pointer"
+                          <div class="account-name text-start font-mono text-base-content cursor-pointer"
                                _="on click showOnlyAccountDataset('{{ account.account.name }}')">
                             {{ account.account.name }}
                           </div>
@@ -184,11 +185,12 @@
                 {% endfor %}
               </c-ui.info-card>
             </div>
-          </div>
         </div>
-        <div class="w-full xl:w-7/12">
-          <div class="chart-container relative min-h-[40vh] h-full">
-            <canvas id="accountBalanceChart"></canvas>
+        <div class="col lg:col-7">
+          <div class="chart-container relative min-h-[40vh] h-full card bg-base-100">
+            <div class="card-body">
+              <canvas id="accountBalanceChart"></canvas>
+            </div>
           </div>
         </div>
       </div>
diff --git a/app/templates/transactions/pages/transactions.html b/app/templates/transactions/pages/transactions.html
index f4b570c..717d914 100644
--- a/app/templates/transactions/pages/transactions.html
+++ b/app/templates/transactions/pages/transactions.html
@@ -5,7 +5,7 @@
 {% block title %}{% translate 'Transactions' %}{% endblock %}
 
 {% block content %}
-  <div class="container px-md-3 py-3 column-gap-5">
+  <div class="container px-md-3 py-3 column-gap-5 overflow-x-hidden">
     <div class="flex flex-wrap gap-x-xl-4 gap-y-3">
       <div class="w-full xl:w-8/12 order-2 xl:order-1">
         <div class="mb-3">
diff --git a/app/templates/users/login.html b/app/templates/users/login.html
index 9d8413d..352541c 100644
--- a/app/templates/users/login.html
+++ b/app/templates/users/login.html
@@ -7,10 +7,8 @@
 {% block title %}Login{% endblock %}
 
 {% block content %}
-  <div>
-    <div class="container">
-      <div class="grid h-dvh flex justify-center items-center">
-        <div class="col-span-12 md:col-span-6 xl:col-span-4">
+  <div class="min-h-screen flex items-center justify-center p-4">
+    <div class="w-full max-w-md">
           {% settings "DEMO" as demo_mode %}
           {% if demo_mode %}
             <div class="card bg-base-100 shadow-xl mb-3">
@@ -47,7 +45,5 @@
             </div>
           </div>
         </div>
-      </div>
-    </div>
   </div>
 {% endblock %}
diff --git a/app/templates/yearly_overview/pages/yearly_overview_base.html b/app/templates/yearly_overview/pages/yearly_overview_base.html
index 39fed42..eb2c083 100644
--- a/app/templates/yearly_overview/pages/yearly_overview_base.html
+++ b/app/templates/yearly_overview/pages/yearly_overview_base.html
@@ -22,7 +22,7 @@
       </a>
     </div>
   </div>
-  <div class="container px-md-3 py-3 gap-x-5" id="yearly-content">
+  <div class="container px-md-3 py-3 gap-x-5 overflow-x-hidden" id="yearly-content">
     <div class="flex flex-wrap mb-4 gap-x-xl-4 gap-y-3">
       {#    Date picker#}
       <div class="w-full xl:w-auto flex-row items-center flex">
@@ -33,7 +33,7 @@
              href="{% block previous_year_url %}{% endblock %}">
             <i class="fa-solid fa-chevron-left"></i></a>
         </div>
-        <div class="text-3xl font-bold font-mono w-full text-center">
+        <div class="text-2xl font-bold btn btn-ghost flex-1 text-center whitespace-normal flex-wrap h-auto min-w-0">
           {{ year }}
         </div>
         <div class="text-base mx-2 h-full items-center flex btn btn-ghost">
diff --git a/frontend/src/select.js b/frontend/src/select.js
index 7db1332..42072c9 100644
--- a/frontend/src/select.js
+++ b/frontend/src/select.js
@@ -9,7 +9,6 @@ window.TomSelect = function createDynamicTomSelect(element) {
     const config = {
         plugins: {},
         maxOptions: null,
-        dropdownParent: 'body',
 
         // Extract 'create' option from data attribute
         create: element.dataset.create === 'true',
@@ -25,8 +24,12 @@ window.TomSelect = function createDynamicTomSelect(element) {
         },
 
         onInitialize: function () {
+            // Move dropdown to body to escape stacking context issues
+            document.body.appendChild(this.dropdown);
+
             this.popper = Popper.createPopper(this.control, this.dropdown, {
                 placement: "bottom-start",
+                strategy: "fixed",
                 modifiers: [
                     {
                         name: "sameWidth",
@@ -43,6 +46,13 @@ window.TomSelect = function createDynamicTomSelect(element) {
                             fallbackPlacements: ['top-start'],
                         },
                     },
+                    {
+                        name: 'preventOverflow',
+                        options: {
+                            boundary: 'viewport',
+                            padding: 8,
+                        },
+                    },
                 ]
 
             });
@@ -50,6 +60,9 @@ window.TomSelect = function createDynamicTomSelect(element) {
         },
         onDropdownOpen: function () {
             this.popper.update();
+        },
+        onDropdownClose: function () {
+            // Optional: move back to wrapper to keep DOM clean, but not necessary
         }
     };
 
diff --git a/frontend/src/styles/_tom-select.scss b/frontend/src/styles/_tom-select.scss
index 4aa3a56..5e5eaff 100644
--- a/frontend/src/styles/_tom-select.scss
+++ b/frontend/src/styles/_tom-select.scss
@@ -195,12 +195,12 @@
 
     /* Dropdown */
     .ts-dropdown {
-        position: absolute;
-        top: 100%;
+        position: fixed;
+        top: 0;
         left: 0;
-        width: 100%;
+        width: auto;
         z-index: 1100;
-        margin: 0.25rem 0 0;
+        margin: 0;
 
         /* DaisyUI dropdown styling */
         background-color: var(--color-base-100);
diff --git a/frontend/src/styles/tailwind.css b/frontend/src/styles/tailwind.css
index 98f9e28..93e4c9d 100644
--- a/frontend/src/styles/tailwind.css
+++ b/frontend/src/styles/tailwind.css
@@ -119,7 +119,7 @@
 @layer components {
     /* === Sidebar styles === */
     .sidebar-active {
-        @apply text-primary-content bg-primary;
+        @apply text-primary-content bg-primary rounded-box;
     }
 
     .sidebar-item:not(.sidebar-active) {
@@ -145,9 +145,28 @@
         @apply lg:ml-16 transition-all duration-100;
     }
 
-    .sidebar-floating .sidebar-item span {
+    .sidebar-floating .sidebar-item {
+        /* Maintains consistent height when collapsed */
+        @apply lg:min-h-[2.3rem];
+    }
+
+    .sidebar-floating .sidebar-item i {
+        /* Centers icon when collapsed by adding auto margins */
+        @apply lg:mx-auto lg:group-hover:mx-0;
+    }
+
+    .sidebar-floating .sidebar-item span,
+    .sidebar-floating .sidebar-item i:not(:first-child) {
         /* Hides the text labels and reveals them only on hover */
         @apply lg:invisible lg:group-hover:visible;
+        /* Position absolute to remove from layout when invisible */
+        @apply lg:absolute lg:group-hover:static;
+    }
+
+    .htmx-swapping .sidebar-floating,
+    .htmx-settling .sidebar-floating {
+        pointer-events: none;
+        @apply lg:w-16!;
     }
 
     .sidebar-floating .sidebar-invisible {
diff --git a/frontend/vite.config.js b/frontend/vite.config.js
index fe48656..0f337da 100644
--- a/frontend/vite.config.js
+++ b/frontend/vite.config.js
@@ -42,7 +42,8 @@ export default defineConfig({
             usePolling: true,
             disableGlobbing: false,
         },
-        origin: 'http://localhost:5173'
+        cors: true,
+        origin: 'http://100.118.164.62:5173'
     },
 
     resolve: {