From 980deb61f9ccba11441ddf2fcba86d578722e4a4 Mon Sep 17 00:00:00 2001
From: Mono Mono <monomono@disroot.org>
Date: Sat, 17 Aug 2024 18:25:05 -0500
Subject: [PATCH 1/3] feat(View): add base template and menu.
---
.../don_confiao/templates/don_confiao/base.html | 14 ++++++++++++++
.../don_confiao/templates/don_confiao/menu.html | 10 ++++++++++
2 files changed, 24 insertions(+)
create mode 100644 tienda_ilusion/don_confiao/templates/don_confiao/base.html
create mode 100644 tienda_ilusion/don_confiao/templates/don_confiao/menu.html
diff --git a/tienda_ilusion/don_confiao/templates/don_confiao/base.html b/tienda_ilusion/don_confiao/templates/don_confiao/base.html
new file mode 100644
index 0000000..0a25775
--- /dev/null
+++ b/tienda_ilusion/don_confiao/templates/don_confiao/base.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <title>Don Confiao - Tienda la Ilusión</title>
+ </head>
+ <body>
+ <div id="menu">
+ {% include 'don_confiao/menu.html' %}
+ </div>
+ <div id="content">
+ {% block content %} {% endblock %}
+ </div>
+ </body>
+</html>
diff --git a/tienda_ilusion/don_confiao/templates/don_confiao/menu.html b/tienda_ilusion/don_confiao/templates/don_confiao/menu.html
new file mode 100644
index 0000000..7978d3b
--- /dev/null
+++ b/tienda_ilusion/don_confiao/templates/don_confiao/menu.html
@@ -0,0 +1,10 @@
+<nav>
+ <ul>
+ <li><a href='./comprar'>Comprar</a></li>
+ <li><a href='./compras'>Compras</a></li>
+ <li><a href='./lista_productos'>Productos</a></li>
+ <li><a href='./importar_productos'>Importar Productos</a></li>
+ <li><a href='./cuadrar_tarro'>Cuadrar tarro</a></li>
+
+ </ul>
+</nav>
From 0e15192f37bff730ab3ee70aedd6e3ce7bd71d5b Mon Sep 17 00:00:00 2001
From: Mono Mono <monomono@disroot.org>
Date: Sat, 17 Aug 2024 18:25:41 -0500
Subject: [PATCH 2/3] view: using base template.
---
.../don_confiao/templates/don_confiao/import_products.html | 3 +++
.../don_confiao/templates/don_confiao/product_list.html | 3 ++-
.../don_confiao/templates/don_confiao/purchase.html | 4 +++-
.../don_confiao/templates/don_confiao/purchase_summary.html | 5 +++++
.../don_confiao/templates/don_confiao/purchases.html | 5 +++++
.../don_confiao/templates/don_confiao/reconciliate_jar.html | 6 +++++-
6 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/tienda_ilusion/don_confiao/templates/don_confiao/import_products.html b/tienda_ilusion/don_confiao/templates/don_confiao/import_products.html
index 376952d..3c9d1f9 100644
--- a/tienda_ilusion/don_confiao/templates/don_confiao/import_products.html
+++ b/tienda_ilusion/don_confiao/templates/don_confiao/import_products.html
@@ -1,3 +1,5 @@
+{% extends 'don_confiao/base.html' %}
+{% block content %}
{% if form.is_multipart %}
<form enctype="multipart/form-data" method="post">
{% else %}
@@ -8,3 +10,4 @@
{{ form }}
<input type="submit" value="Importar">
</form>
+{% endblock %}
diff --git a/tienda_ilusion/don_confiao/templates/don_confiao/product_list.html b/tienda_ilusion/don_confiao/templates/don_confiao/product_list.html
index 0ff63b9..d9dbcfd 100644
--- a/tienda_ilusion/don_confiao/templates/don_confiao/product_list.html
+++ b/tienda_ilusion/don_confiao/templates/don_confiao/product_list.html
@@ -1,9 +1,10 @@
+{% extends 'don_confiao/base.html' %}
+{% block content %}
<form action="" method="get">
<label>Filtro por nombre:</label>
<input type="text" name="name" value="{{ request.GET.name }}">
<button type="submit">Filtrar</button>
</form>
-{% block content %}
<h1>Lista de productos</h1>
<ul>
{% for obj in object_list %}
diff --git a/tienda_ilusion/don_confiao/templates/don_confiao/purchase.html b/tienda_ilusion/don_confiao/templates/don_confiao/purchase.html
index c21690b..f17caf8 100644
--- a/tienda_ilusion/don_confiao/templates/don_confiao/purchase.html
+++ b/tienda_ilusion/don_confiao/templates/don_confiao/purchase.html
@@ -1,4 +1,5 @@
-<!doctype html>
+{% extends 'don_confiao/base.html' %}
+{% block content %}
{% load static %}
<form id="complete_form_purchase" method="POST">
{% csrf_token %}
@@ -20,3 +21,4 @@
<script src="{% static 'js/sale_summary.js' %}"></script>
<script src="{% static 'js/calculate_subtotal_line.js' %}"></script>
</form>
+{% endblock %}
diff --git a/tienda_ilusion/don_confiao/templates/don_confiao/purchase_summary.html b/tienda_ilusion/don_confiao/templates/don_confiao/purchase_summary.html
index b10494a..b3af74f 100644
--- a/tienda_ilusion/don_confiao/templates/don_confiao/purchase_summary.html
+++ b/tienda_ilusion/don_confiao/templates/don_confiao/purchase_summary.html
@@ -1,3 +1,6 @@
+{% extends 'don_confiao/base.html' %}
+{% block content %}
+
<h1>Resumen de compra</h1>
<dl>
<dt>Date</dt> <dd>{{ purchase.date }}</dd>
@@ -5,3 +8,5 @@
<dt>Customer</dt> <dd>{{ purchase.customer.name }}</dd>
<dt>Total</dt> <dd>{{ purchase.get_total }}</dd>
</dl>
+
+{% endblock %}
diff --git a/tienda_ilusion/don_confiao/templates/don_confiao/purchases.html b/tienda_ilusion/don_confiao/templates/don_confiao/purchases.html
index 20e3de2..3ce9533 100644
--- a/tienda_ilusion/don_confiao/templates/don_confiao/purchases.html
+++ b/tienda_ilusion/don_confiao/templates/don_confiao/purchases.html
@@ -1,3 +1,6 @@
+{% extends 'don_confiao/base.html' %}
+{% block content %}
+
{% if purchases %}
<ul>
{% for purchase in purchases %}
@@ -7,3 +10,5 @@
{% else %}
<p>No hay Compras</p>
{% endif %}
+
+{% endblock %}
diff --git a/tienda_ilusion/don_confiao/templates/don_confiao/reconciliate_jar.html b/tienda_ilusion/don_confiao/templates/don_confiao/reconciliate_jar.html
index 6771044..74a47d3 100644
--- a/tienda_ilusion/don_confiao/templates/don_confiao/reconciliate_jar.html
+++ b/tienda_ilusion/don_confiao/templates/don_confiao/reconciliate_jar.html
@@ -1,4 +1,6 @@
-<!doctype html>
+{% extends 'don_confiao/base.html' %}
+{% block content %}
+
{% if summary.total %}
<div class="reconciliate_jar summary" style="border: solid 1px brown; margin: 10px">
<h2>Pagos No reconciliados</h2>
@@ -28,3 +30,5 @@
<h2>No hay pagos registrados.</h2>
</div>
{% endif %}
+
+{% endblock %}
From f250cdada2e90eb5e8e883e969f9222e275c9bff Mon Sep 17 00:00:00 2001
From: Mono Mono <monomono@disroot.org>
Date: Sat, 17 Aug 2024 19:07:06 -0500
Subject: [PATCH 3/3] view(css): add style to main menu.
---
.../don_confiao/static/css/main_menu.css | 33 +++++++++++++++++++
.../templates/don_confiao/menu.html | 14 ++++----
.../templates/don_confiao/purchases.html | 2 +-
3 files changed, 42 insertions(+), 7 deletions(-)
create mode 100644 tienda_ilusion/don_confiao/static/css/main_menu.css
diff --git a/tienda_ilusion/don_confiao/static/css/main_menu.css b/tienda_ilusion/don_confiao/static/css/main_menu.css
new file mode 100644
index 0000000..63edf8d
--- /dev/null
+++ b/tienda_ilusion/don_confiao/static/css/main_menu.css
@@ -0,0 +1,33 @@
+
+nav#main_menu ul {
+ list-style: none;
+ margin: 0;
+ padding: 0;
+ display: flex;
+ justify-content: space-between;
+ padding-bottom: 1em;
+}
+
+nav#main_menu li {
+ margin-right: 20px;
+}
+
+nav#main_menu a {
+ text-decoration: none;
+ color: #333;
+ background-color: #f0f0f0;
+ padding: 10px 20px;
+ border: none;
+ border-radius: 5px;
+ cursor: pointer;
+}
+
+nav#main_menu a:hover {
+ background-color: #ccc;
+ color: #666;
+}
+
+nav#main_menu a:active {
+ background-color: #aaa;
+ color: #444;
+}
diff --git a/tienda_ilusion/don_confiao/templates/don_confiao/menu.html b/tienda_ilusion/don_confiao/templates/don_confiao/menu.html
index 7978d3b..383fff8 100644
--- a/tienda_ilusion/don_confiao/templates/don_confiao/menu.html
+++ b/tienda_ilusion/don_confiao/templates/don_confiao/menu.html
@@ -1,10 +1,12 @@
-<nav>
+{% load static %}
+<link rel="stylesheet" type="text/css" href="{% static 'css/main_menu.css' %}">
+<nav id="main_menu">
<ul>
- <li><a href='./comprar'>Comprar</a></li>
- <li><a href='./compras'>Compras</a></li>
- <li><a href='./lista_productos'>Productos</a></li>
- <li><a href='./importar_productos'>Importar Productos</a></li>
- <li><a href='./cuadrar_tarro'>Cuadrar tarro</a></li>
+ <li><a href='/don_confiao/comprar'>Comprar</a></li>
+ <li><a href='/don_confiao/compras'>Compras</a></li>
+ <li><a href='/don_confiao/lista_productos'>Productos</a></li>
+ <li><a href='/don_confiao/importar_productos'>Importar Productos</a></li>
+ <li><a href='/don_confiao/cuadrar_tarro'>Cuadrar tarro</a></li>
</ul>
</nav>
diff --git a/tienda_ilusion/don_confiao/templates/don_confiao/purchases.html b/tienda_ilusion/don_confiao/templates/don_confiao/purchases.html
index 3ce9533..c00c823 100644
--- a/tienda_ilusion/don_confiao/templates/don_confiao/purchases.html
+++ b/tienda_ilusion/don_confiao/templates/don_confiao/purchases.html
@@ -4,7 +4,7 @@
{% if purchases %}
<ul>
{% for purchase in purchases %}
- <li><a href="/don_confiao/{{ purchase.id }}/">{{ purchase.date }}, {{ purchase.customer }}</a></li>
+ <li><a href="/don_confiao/resumen_compra/{{ purchase.id }}">{{ purchase.date }}, {{ purchase.customer }}</a></li>
{% endfor %}
</ul>
{% else %}