diff --git a/db.sqlite3 b/db.sqlite3 index 4ad1a34..5f9e6ea 100644 Binary files a/db.sqlite3 and b/db.sqlite3 differ diff --git a/expense_tracker/__pycache__/__init__.cpython-312.pyc b/expense_tracker/__pycache__/__init__.cpython-312.pyc index facabdc..578fe40 100644 Binary files a/expense_tracker/__pycache__/__init__.cpython-312.pyc and b/expense_tracker/__pycache__/__init__.cpython-312.pyc differ diff --git a/expense_tracker/__pycache__/settings.cpython-312.pyc b/expense_tracker/__pycache__/settings.cpython-312.pyc index 73f259e..4193218 100644 Binary files a/expense_tracker/__pycache__/settings.cpython-312.pyc and b/expense_tracker/__pycache__/settings.cpython-312.pyc differ diff --git a/expense_tracker/__pycache__/urls.cpython-312.pyc b/expense_tracker/__pycache__/urls.cpython-312.pyc index b475d7b..037a278 100644 Binary files a/expense_tracker/__pycache__/urls.cpython-312.pyc and b/expense_tracker/__pycache__/urls.cpython-312.pyc differ diff --git a/expense_tracker/__pycache__/wsgi.cpython-312.pyc b/expense_tracker/__pycache__/wsgi.cpython-312.pyc index 00a3f3c..1e6040d 100644 Binary files a/expense_tracker/__pycache__/wsgi.cpython-312.pyc and b/expense_tracker/__pycache__/wsgi.cpython-312.pyc differ diff --git a/expenses/__pycache__/__init__.cpython-312.pyc b/expenses/__pycache__/__init__.cpython-312.pyc index 65aaa0c..4830f6a 100644 Binary files a/expenses/__pycache__/__init__.cpython-312.pyc and b/expenses/__pycache__/__init__.cpython-312.pyc differ diff --git a/expenses/__pycache__/admin.cpython-312.pyc b/expenses/__pycache__/admin.cpython-312.pyc index df4922b..833e849 100644 Binary files a/expenses/__pycache__/admin.cpython-312.pyc and b/expenses/__pycache__/admin.cpython-312.pyc differ diff --git a/expenses/__pycache__/apps.cpython-312.pyc b/expenses/__pycache__/apps.cpython-312.pyc index e5589be..56dbc1d 100644 Binary files a/expenses/__pycache__/apps.cpython-312.pyc and b/expenses/__pycache__/apps.cpython-312.pyc differ diff --git a/expenses/__pycache__/forms.cpython-312.pyc b/expenses/__pycache__/forms.cpython-312.pyc index 934d636..7e92f17 100644 Binary files a/expenses/__pycache__/forms.cpython-312.pyc and b/expenses/__pycache__/forms.cpython-312.pyc differ diff --git a/expenses/__pycache__/models.cpython-312.pyc b/expenses/__pycache__/models.cpython-312.pyc index c8eee25..5b7fefe 100644 Binary files a/expenses/__pycache__/models.cpython-312.pyc and b/expenses/__pycache__/models.cpython-312.pyc differ diff --git a/expenses/__pycache__/urls.cpython-312.pyc b/expenses/__pycache__/urls.cpython-312.pyc index fbc4c3b..657ac67 100644 Binary files a/expenses/__pycache__/urls.cpython-312.pyc and b/expenses/__pycache__/urls.cpython-312.pyc differ diff --git a/expenses/__pycache__/views.cpython-312.pyc b/expenses/__pycache__/views.cpython-312.pyc index 2166936..4130e73 100644 Binary files a/expenses/__pycache__/views.cpython-312.pyc and b/expenses/__pycache__/views.cpython-312.pyc differ diff --git a/expenses/migrations/__pycache__/0001_initial.cpython-312.pyc b/expenses/migrations/__pycache__/0001_initial.cpython-312.pyc index ee34df1..68fd912 100644 Binary files a/expenses/migrations/__pycache__/0001_initial.cpython-312.pyc and b/expenses/migrations/__pycache__/0001_initial.cpython-312.pyc differ diff --git a/expenses/migrations/__pycache__/__init__.cpython-312.pyc b/expenses/migrations/__pycache__/__init__.cpython-312.pyc index 0565ad9..89e704a 100644 Binary files a/expenses/migrations/__pycache__/__init__.cpython-312.pyc and b/expenses/migrations/__pycache__/__init__.cpython-312.pyc differ diff --git a/expenses/static/icons/github.svg b/expenses/static/icons/github.svg new file mode 100644 index 0000000..ca269a0 --- /dev/null +++ b/expenses/static/icons/github.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/expenses/static/images/logo.png b/expenses/static/images/logo.png new file mode 100644 index 0000000..66a98ca Binary files /dev/null and b/expenses/static/images/logo.png differ diff --git a/expenses/templates/accueil.html b/expenses/templates/accueil.html index b17511f..f1b63f1 100644 --- a/expenses/templates/accueil.html +++ b/expenses/templates/accueil.html @@ -1,96 +1,210 @@ + + + + Expense Manager + + - - - - Expense Manager - - - - - - - - - - - - + + +
+ +
+
+ Magnet Logo + Expense Manager +
- - + -
- -
-
-
-
-
+ +
-

- Commencer par bien
- Gerer vos budget et
- Economiser De L'argent -

+ -

- Maîtrisez vos finances avec notre application simple et intuitive. Suivez vos dépenses et économisez chaque mois  -

+ +
+
+ +
+
+ N°1 des applications +
+
+
+
+
-
- S'inscrire - Se connecter +

+ Gérez vos finances facilement avec Expense Manager +

+

+ This banking app will help you control your spending, savings and + investments in one place. +

+ +
+ +
+ +
+
+
+ App Icon +
+
+

Download Magnet App

+

+ Available for iOS and Android +

+
+ → +
+ +
+
+
+
+
+
+ 22.5K + satisfied users +
+
-
-
- Hero Image + +
+
+ App Interface +
+
+ Debit Card
-
- -
- - - - - - - - \ No newline at end of file + +
+ + diff --git a/expenses/templates/expenses/base.html b/expenses/templates/expenses/base.html index 7c175b4..c5c579d 100644 --- a/expenses/templates/expenses/base.html +++ b/expenses/templates/expenses/base.html @@ -120,9 +120,9 @@ + {% if user.is_authenticated %}
- + {% endif %} @@ -177,4 +170,4 @@ - + \ No newline at end of file diff --git a/expenses/templates/expenses/home.html b/expenses/templates/expenses/home.html index 89a7b57..8a78498 100644 --- a/expenses/templates/expenses/home.html +++ b/expenses/templates/expenses/home.html @@ -1,116 +1,134 @@ -{% extends "expenses/base.html" %} -{% load crispy_forms_tags static %} +{% extends "expenses/base.html" %} {% load crispy_forms_tags static %} {% block content %}
-

Dashboard

- - -
-
-
- -
- Dollar -
Nouvelle Dépense
-
- -
-
-
-
- -
- Dollar -
Budget
-
- -
-
+

Dashboard

+ + +
+
+
+ +
+ Dollar +
Nouvelle Dépense
+
+ +
+
+
+ +
+ Dollar +
Budget
+
+ +
+
+
- -
-
-
-
-

Résumé du mois

- {% if budget %} - - - - - - - - - - - - - - - -
Total DépensesBudgetReste
${{ total_expenses }}${{ budget.montant }}${{ remaining_budget }}
-
-
-
-
- {% else %} -

Aucun budget défini pour ce mois.

- Définir un budget - {% endif %} -
-
+ +
+
+
+
+

Résumé du mois

+ {% if budget %} + + + + + + + + + + + + + + + +
Total DépensesBudgetReste
${{ total_expenses }}${{ budget.montant }} + ${{ remaining_budget }} +
+
+
+
+ {% else %} +

Aucun budget défini pour ce mois.

+ Définir un budget + {% endif %}
+
+
- -
-
-
-
-

Dépenses récentes

- {% if expenses %} -
- - - - - - - - - - - {% for expense in expenses %} - - - - - - - {% endfor %} - -
ImageNomMontantDate
- {% if expense.image %} - Reçu - {% else %} - Pas d'image - {% endif %} - {{ expense.nom }}{{ expense.montant }}€{{ expense.date }}
-
+ +
+
+
+
+

Dépenses récentes

+ {% if expenses %} +
+ + + + + + + + + + + {% for expense in expenses %} + + + + + + + {% endfor %} + +
ImageNomMontantDate
+ {% if expense.image %} + Reçu {% else %} -

Aucune dépense enregistrée ce mois-ci.

+ Pas d'image {% endif %} - - + 		{{ expense.nom }}{{ expense.montant }}€{{ expense.date }}
+
+ {% else %} +

Aucune dépense enregistrée ce mois-ci.

+ {% endif %}
+
+
{% endblock %} diff --git a/expenses/templatetags/__pycache__/__init__.cpython-312.pyc b/expenses/templatetags/__pycache__/__init__.cpython-312.pyc index 7821009..b5bbefe 100644 Binary files a/expenses/templatetags/__pycache__/__init__.cpython-312.pyc and b/expenses/templatetags/__pycache__/__init__.cpython-312.pyc differ diff --git a/expenses/templatetags/__pycache__/expense_extras.cpython-312.pyc b/expenses/templatetags/__pycache__/expense_extras.cpython-312.pyc index 20b5eaa..4c0a979 100644 Binary files a/expenses/templatetags/__pycache__/expense_extras.cpython-312.pyc and b/expenses/templatetags/__pycache__/expense_extras.cpython-312.pyc differ diff --git a/expenses/urls.py b/expenses/urls.py index 42cc097..7d030a1 100644 --- a/expenses/urls.py +++ b/expenses/urls.py @@ -11,5 +11,6 @@ path('budget/add/', views.add_budget, name='add_budget'), path('expense/add/', views.add_expense, name='add_expense'), path('history/', views.history, name='history'), + # path('stats/', views.stats, name='stats'), ]