diff --git a/expenses_manager/expenses/static/expenses/css/base.css b/expenses_manager/expenses/static/expenses/css/base.css index cd94a86..c3655f8 100644 --- a/expenses_manager/expenses/static/expenses/css/base.css +++ b/expenses_manager/expenses/static/expenses/css/base.css @@ -1,3 +1,43 @@ +body { + margin: 0; + font-family: system-ui, sans-serif; + background: #f6f7f9; +} + +.topbar { + background: #1f2937; + padding: 12px 20px; +} + +.nav { + display: flex; + align-items: center; + gap: 16px; +} + +.nav a { + color: #e5e7eb; + text-decoration: none; + font-weight: 500; +} + +.nav a:hover { + text-decoration: underline; +} + +.spacer { + flex: 1; +} + +.user { + color: #9ca3af; + margin-right: 8px; +} + +.content { + padding: 24px; +} + .dashboard-grid { display: grid; grid-template-columns: repeat(auto-fit, minmax(300px, 500px)); diff --git a/expenses_manager/expenses/templates/expenses/account_confirm_delete.html b/expenses_manager/expenses/templates/expenses/account_confirm_delete.html index 9632630..6ccaca9 100644 --- a/expenses_manager/expenses/templates/expenses/account_confirm_delete.html +++ b/expenses_manager/expenses/templates/expenses/account_confirm_delete.html @@ -1,24 +1,18 @@ -{% load static %} - - - - Eliminar - - - +{% extends "expenses/base.html" %} +{% block title %}Eliminar{% endblock %} +{% block content %} -

Eliminar cuenta

+

Eliminar cuenta

-

- ¿Seguro que quieres eliminar la cuenta - {{ account.name }} -

+

+ ¿Seguro que quieres eliminar la cuenta + {{ account.name }} +

-
- {% csrf_token %} - - Cancelar -
+
+ {% csrf_token %} + + Cancelar +
- - \ No newline at end of file +{% endblock %} \ No newline at end of file diff --git a/expenses_manager/expenses/templates/expenses/account_form.html b/expenses_manager/expenses/templates/expenses/account_form.html index a602c4d..07c7510 100644 --- a/expenses_manager/expenses/templates/expenses/account_form.html +++ b/expenses_manager/expenses/templates/expenses/account_form.html @@ -1,27 +1,21 @@ -{% load static %} - - - - Cuenta - - - +{% extends "expenses/base.html" %} +{% block title %}Cuenta{% endblock %} +{% block content %} -

- {% if form.instance.pk %} - Editar cuenta - {% else %} - Nueva cuenta - {% endif %} -

+

+ {% if form.instance.pk %} + Editar cuenta + {% else %} + Nueva cuenta + {% endif %} +

-
- {% csrf_token %} - {{ form.as_p }} + + {% csrf_token %} + {{ form.as_p }} - - Cancelar -
+ + Cancelar + - - \ No newline at end of file +{% endblock %} \ No newline at end of file diff --git a/expenses_manager/expenses/templates/expenses/account_list.html b/expenses_manager/expenses/templates/expenses/account_list.html index f90259a..d059154 100644 --- a/expenses_manager/expenses/templates/expenses/account_list.html +++ b/expenses_manager/expenses/templates/expenses/account_list.html @@ -1,44 +1,38 @@ -{% load static %} - - - - Cuentas - - - +{% extends "expenses/base.html" %} +{% block title %}Cuentas{% endblock %} +{% block content %} -

Mis cuentas

+

Mis cuentas

- ➕ Nueva cuenta + ➕ Nueva cuenta - - +
+ + + + + + + + + + + {% for account in accounts %} - - - - - + + + + + - - - {% for account in accounts %} - - - - - - - - {% empty %} - - - - {% endfor %} - -
NombreSaldo inicialSaldo actualActiva
NombreSaldo inicialSaldo actualActiva{{ account.name }}{{ account.initial_balance }}{{ account.current_balance|floatformat:2 }}{{ account.active }} + Editar + Eliminar +
{{ account.name }}{{ account.initial_balance }}{{ account.current_balance|floatformat:2 }}{{ account.active }} - Editar - Eliminar -
No hay cuentas
- - \ No newline at end of file + {% empty %} + + No hay cuentas + + {% endfor %} + + +{% endblock %} \ No newline at end of file diff --git a/expenses_manager/expenses/templates/expenses/base.html b/expenses_manager/expenses/templates/expenses/base.html new file mode 100644 index 0000000..6567115 --- /dev/null +++ b/expenses_manager/expenses/templates/expenses/base.html @@ -0,0 +1,36 @@ +{% load static %} + + + + + {% block title %}Expenses manager{% endblock %} + + + + + + +
+ +
+ +
+ {% block content %}{% endblock %} +
+ + \ No newline at end of file diff --git a/expenses_manager/expenses/templates/expenses/dashboard.html b/expenses_manager/expenses/templates/expenses/dashboard.html index 18d4ffb..ac819c4 100644 --- a/expenses_manager/expenses/templates/expenses/dashboard.html +++ b/expenses_manager/expenses/templates/expenses/dashboard.html @@ -1,258 +1,253 @@ - +{% extends "expenses/base.html" %} +{% block title %}Dashboard{% endblock %} - - - Dashboard - +{% block content %} + + +

+ Dashboard + {% if selected_account_obj %} + — {{ selected_account_obj.name }} + {% endif %} +

+ + + + - - +
+ Este mes | + Mes anterior | + Este año +
+ +
-

- Dashboard - {% if selected_account_obj %} - — {{ selected_account_obj.name }} - {% endif %} -

- - - - - -
- Este mes | - Mes anterior | - Este año -
- -
- -
- - - - - - - - + {% for y in year_list %} + {% endfor %} + - -
+ -

- Mostrando: - {{ selected_year }} - {% if selected_month %}/{{ selected_month }}{% endif %} -

-

Comparado con el periodo inmediatamente anterior

+ -
- - - - - - -
- -
-

Saldo actual

- {{ kpi_balance|floatformat:2 }}€ -
- -
-

Total

-

{{ kpi_total }}€

-
- -
-

Nº de gastos

-

{{ kpi_count }}

-
- -
-

Categorías

-

{{ kpi_categories }}

-
- -
- - {% if compare_enabled %} -
-

Comparación con periodo anterior

- - {% if kpi_previous_total == 0 %} -

No hay datos en el periodo anterior

- {% else %} -

- Total anterior: {{ kpi_previous_total|floatformat:2 }} -

- {% endif %} - -
- Diferencia: - {% if kpi_trend == "up" %} - ▲ {{ kpi_difference|floatformat:2 }}€ - {% elif kpi_trend == "down" %} - ▼ {{ kpi_difference_abs|floatformat:2 }}€ - {% else %} - 0€ - {% endif %} -
-

- Variación: - {% if kpi_percentage is not None %} - {{ kpi_percentage|floatformat:2 }}% - {% else %} - Variación: N/D - {% endif %} -

-
- {% endif %} - - - - -

Gastos por categoría

- - {% if not by_category %} -

No hay gastos para este periodo.

- {% else %} - - - - - - - - - {% for row in by_category %} - - - - - {% empty %} - - - - {% endfor %} - -
CategoríaTotal
{{ row.category__name }}{{ row.total }}
Sin datos
- {% endif %} - - {% if compare_enabled %} -

Comparativa por categoría

- - - - - - - - - - - - {% for row in category_comparison %} - - - - - - - {% endfor %} - -
CategoríaActualAnteriorDiferencia
{{ row.category }}{{ row.current|floatformat:2 }}€{{ row.previous }} - {% if row.difference > 0 %} - ▲ {{ row.difference|floatformat:2 }}€ - {% elif row.difference < 0 %} - ▼ {{ row.difference_abs|floatformat:2 }}€ - {% else %} - = - {% endif %} -
- {% endif %} - -
- - - - - -

Gastos por mes

- -