jkuijperm/expenses_manager
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Visual improvements

Browse Source
This commit is contained in:
JKuijperM 2026-02-06 22:23:32 +01:00
parent de33e5db03
commit ae46c7993d
5 changed files with 51 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
expenses_manager/expenses/static/expenses/css/base.css
View File

@ -1,7 +1,7 @@
body { body {
margin: 0; margin: 0;
font-family: system-ui, sans-serif; font-family: system-ui, sans-serif;
background: #f6f7f9; background: #f7f7f7;
} }
.topbar { .topbar {
@ -36,8 +36,16 @@ body {
text-decoration: underline; text-decoration: underline;
} }
.nav-item.active {
font-weight: bold;
border-bottom: 2px solid white;
}
.logout-form { .logout-form {
margin: 0; margin: 0;
border: none;
cursor: pointer;
color: white;
} }
.spacer { .spacer {

15
expenses_manager/expenses/templates/expenses/base.html
View File

@ -6,18 +6,19 @@
<title>{% block title %}Expenses manager{% endblock %}</title> <title>{% block title %}Expenses manager{% endblock %}</title>
<link rel="stylesheet" href="{% static 'expenses/css/base.css' %}"> <link rel="stylesheet" href="{% static 'expenses/css/base.css' %}">
<script src="https://cdn.jsdelivr.net/npm/chart.js"></script> <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
{% block extra_css %}{% endblock %}
</head> </head>
<body> <body>
{% if user.is_authenticated %} {% if user.is_authenticated %}
<header class="topbar"> <header class="topbar">
<nav class="nav"> <nav class="nav">
<a href="{% url 'home' %}">Home</a> <a href="{% url 'home' %}" class="nav-item {% if active_menu == 'home' %}active{% endif %} ">Home</a>
<a href="{% url 'dashboard' %}">Dashboard</a> <a href="{% url 'dashboard' %}" class="nav-item {% if active_menu == 'dashboard' %}active{% endif %} ">Dashboard</a>
<a href="{% url 'expense_list' %}">Gastos</a> <a href="{% url 'expense_list' %}" class="nav-item {% if active_menu == 'expenses' %}active{% endif %} ">Gastos</a>
<a href="{% url 'account_list' %}">Cuentas</a> <a href="{% url 'account_list' %}" class="nav-item {% if active_menu == 'accounts' %}active{% endif %} ">Cuentas</a>
<a href="{% url 'income_list' %}">Ingresos</a> <a href="{% url 'income_list' %}" class="nav-item {% if active_menu == 'incomes' %}active{% endif %} ">Ingresos</a>
<a href="{% url 'tag_list' %}">Etiquetas</a> <a href="{% url 'tag_list' %}" class="nav-item {% if active_menu == 'tags' %}active{% endif %} ">Etiquetas</a>
<span class="spacer"></span> <span class="spacer"></span>
@ -37,5 +38,7 @@
<main class="content"> <main class="content">
{% block content %}{% endblock %} {% block content %}{% endblock %}
</main> </main>
{% block extra_js %}{% endblock %}
</body> </body>
</html> </html>

14
expenses_manager/expenses/templates/expenses/base_auth.html Normal file
View File

@ -0,0 +1,14 @@
{% load static %}
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>{% block title %}Login{% endblock %}</title>
<link rel="stylesheet" href="{% static 'expenses/css/base.css' %}">
</head>
<body>
<main class="auth-container">
{% block content %}{% endblock %}
</main>
</body>
</html>

4
expenses_manager/expenses/templates/registration/login.html
View File

@ -1,6 +1,4 @@
{% extends "expenses/base.html" %} {% extends "expenses/base_auth.html" %}
{% block title %}Login{% endblock %}
{% block content %} {% block content %}

33
expenses_manager/expenses/views.py
View File

@ -90,6 +90,7 @@ def home(request):
}) })
return render(request, 'expenses/home.html', { return render(request, 'expenses/home.html', {
'active_menu': 'home',
'last_expenses': last_expenses, 'last_expenses': last_expenses,
'kpi_total': kpi_total, 'kpi_total': kpi_total,
'kpi_count': kpi_count, 'kpi_count': kpi_count,
@ -180,6 +181,7 @@ def expense_list(request):
request, request,
'expenses/expense_list.html', 'expenses/expense_list.html',
{ {
'active_menu': 'expenses',
'expenses': page_obj, 'expenses': page_obj,
'page_obj': page_obj, 'page_obj': page_obj,
'selected_year': year, 'selected_year': year,
@ -216,7 +218,7 @@ def expense_create(request):
return render( return render(
request, request,
'expenses/expense_form.html', 'expenses/expense_form.html',
{'form': form}, {'active_menu': 'expenses','form': form},
) )
@ -238,7 +240,7 @@ def expense_edit(request, pk):
return render( return render(
request, request,
'expenses/expense_form.html', 'expenses/expense_form.html',
{'form': form} {'active_menu': 'expenses','form': form}
) )
@ -257,7 +259,7 @@ def expense_delete(request, pk):
return render( return render(
request, request,
'expenses/expense_confirm_delete.html', 'expenses/expense_confirm_delete.html',
{'expense': expense}, {'active_menu': 'expenses','expense': expense},
) )
@ -499,6 +501,7 @@ def dashboard(request):
# Send the data to the dashboard # Send the data to the dashboard
return render(request, 'expenses/dashboard.html', { return render(request, 'expenses/dashboard.html', {
'active_menu': 'dashboard',
'by_category': by_category, 'by_category': by_category,
'by_month': by_month, 'by_month': by_month,
'chart_labels': chart_labels, 'chart_labels': chart_labels,
@ -532,7 +535,7 @@ def tag_list(request):
return render( return render(
request, request,
'expenses/tag_list.html', 'expenses/tag_list.html',
{'tags':tags} {'active_menu': 'tags','tags':tags}
) )
@ -551,7 +554,7 @@ def tag_create(request):
return render( return render(
request, request,
'expenses/tag_form.html', 'expenses/tag_form.html',
{'form': form} {'active_menu': 'tags','form': form}
) )
@ -574,7 +577,7 @@ def tag_edit(request, pk):
return render( return render(
request, request,
'expenses/tag_form.html', 'expenses/tag_form.html',
{'form': form} {'active_menu': 'tags','form': form}
) )
@ -593,7 +596,7 @@ def tag_delete(request, pk):
return render( return render(
request, request,
'expenses/tag_confirm_delete.html', 'expenses/tag_confirm_delete.html',
{'tag': tag} {'active_menu': 'tags','tag': tag}
) )
@ -603,7 +606,7 @@ def account_list(request):
return render( return render(
request, request,
'expenses/account_list.html', 'expenses/account_list.html',
{'accounts': accounts} {'active_menu': 'accounts','accounts': accounts}
) )
@ -622,7 +625,7 @@ def account_create(request):
return render( return render(
request, request,
'expenses/account_form.html', 'expenses/account_form.html',
{'form': form} {'active_menu': 'accounts','form': form}
) )
@login_required @login_required
@ -644,7 +647,7 @@ def account_edit(request, pk):
return render( return render(
request, request,
'expenses/account_form.html', 'expenses/account_form.html',
{'form': form} {'active_menu': 'accounts','form': form}
) )
@login_required @login_required
@ -659,7 +662,7 @@ def account_delete(request, pk):
return render( return render(
request, request,
'expenses/account_confirm_delete.html', 'expenses/account_confirm_delete.html',
{'account':account} {'active_menu': 'accounts','account':account}
) )
@login_required @login_required
@ -677,7 +680,7 @@ def income_create(request):
return render( return render(
request, request,
'expenses/income_form.html', 'expenses/income_form.html',
{'form': form} {'active_menu': 'incomes','form': form}
) )
@login_required @login_required
@ -687,7 +690,7 @@ def income_list(request):
return render( return render(
request, request,
'expenses/income_list.html', 'expenses/income_list.html',
{'incomes': incomes} {'active_menu': 'incomes','incomes': incomes}
) )
@login_required @login_required
@ -709,7 +712,7 @@ def income_edit(request, pk):
return render( return render(
request, request,
'expenses/income_form.html', 'expenses/income_form.html',
{'form': form} {'active_menu': 'incomes','form': form}
) )
@login_required @login_required
@ -723,6 +726,6 @@ def income_delete(request, pk):
return render( return render(
request, request,
'expenses/income_confirm_delete.html', 'expenses/income_confirm_delete.html',
{'income':income} {'active_menu': 'incomes','income':income}
) )