Merge pull request 'feature/estilos_don_confiao_comprar' (#23) from feature/estilos_don_confiao_comprar into main
Reviewed-on: OneTeam/don_confiao#23 Reviewed-by: mono <mono@noreply.onecluster.org> Reviewed-by: Rodia <rodia@noreply.onecluster.org>
This commit is contained in:
		@@ -1,33 +1,37 @@
 | 
				
			|||||||
 | 
					 | 
				
			||||||
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 {
 | 
					nav#main_menu a {
 | 
				
			||||||
  text-decoration: none;
 | 
					  text-decoration: none;
 | 
				
			||||||
  color: #333;
 | 
					  font-weight: bold;
 | 
				
			||||||
  background-color: #f0f0f0;
 | 
					  color: white;
 | 
				
			||||||
 | 
					  background-color: #178E79 ;
 | 
				
			||||||
  padding: 10px 20px;
 | 
					  padding: 10px 20px;
 | 
				
			||||||
  border: none;
 | 
					  min-width: 90%;
 | 
				
			||||||
 | 
					  text-align: center;
 | 
				
			||||||
 | 
					  border: solid #178E79 4px;
 | 
				
			||||||
  border-radius: 5px;
 | 
					  border-radius: 5px;
 | 
				
			||||||
  cursor: pointer;
 | 
					  cursor: pointer;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
nav#main_menu a:hover {
 | 
					nav#main_menu a:hover {
 | 
				
			||||||
  background-color: #ccc;
 | 
					  transition: ease-in-out 0.2s;
 | 
				
			||||||
  color: #666;
 | 
					  background-color: #7BDCB5;
 | 
				
			||||||
 | 
					  color: #178E79;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
nav#main_menu a:active {
 | 
					nav#main_menu a:active {
 | 
				
			||||||
  background-color: #aaa;
 | 
					  background-color: #aaa;
 | 
				
			||||||
  color: #444;
 | 
					  color: #444;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					nav#main_menu {
 | 
				
			||||||
 | 
					  display: inline;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					li{
 | 
				
			||||||
 | 
					  width: 100%;
 | 
				
			||||||
 | 
					  display: flex;
 | 
				
			||||||
 | 
					  justify-content: center;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					.page_title {
 | 
				
			||||||
 | 
					  color: #04A1E4
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										
											BIN
										
									
								
								tienda_ilusion/don_confiao/static/img/recreo_logo.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								tienda_ilusion/don_confiao/static/img/recreo_logo.png
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							| 
		 After Width: | Height: | Size: 179 KiB  | 
@@ -1,14 +1,17 @@
 | 
				
			|||||||
 | 
					{% load static %}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
<!DOCTYPE html>
 | 
					<!DOCTYPE html>
 | 
				
			||||||
<html>
 | 
					<html lang="en" class="h-full">
 | 
				
			||||||
    <head>
 | 
					    <head>
 | 
				
			||||||
        <title>Don Confiao - Tienda la Ilusión</title>
 | 
					        <title>Don Confiao - Tienda la Ilusión</title>
 | 
				
			||||||
    </head>
 | 
					    </head>
 | 
				
			||||||
    <body>
 | 
					    <body class="flex h-full w-full">
 | 
				
			||||||
        <div id="menu">
 | 
					        <div id="menu" class="h-full w-2/12 border bg-green-400 max-h-screen overflow-auto">
 | 
				
			||||||
            {% include 'don_confiao/menu.html' %}
 | 
					            {% include 'don_confiao/menu.html' %}
 | 
				
			||||||
        </div>
 | 
					        </div>
 | 
				
			||||||
        <div id="content">
 | 
					        <div id="content" class="w-10/12 h-screen max-h-full overflow-auto">
 | 
				
			||||||
            {% block content %} {% endblock %}
 | 
					            {% block content %} {% endblock %}
 | 
				
			||||||
        </div>
 | 
					        </div>
 | 
				
			||||||
    </body>
 | 
					    </body>
 | 
				
			||||||
 | 
					    <script src="https://cdn.tailwindcss.com/"></script> 
 | 
				
			||||||
</html>
 | 
					</html>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,12 +1,17 @@
 | 
				
			|||||||
{% load static %}
 | 
					{% load static %}
 | 
				
			||||||
<link rel="stylesheet" type="text/css" href="{% static 'css/main_menu.css' %}">
 | 
					<link rel="stylesheet" type="text/css" href="{% static 'css/main_menu.css' %}">
 | 
				
			||||||
<nav id="main_menu">
 | 
					 | 
				
			||||||
    <ul>
 | 
					 | 
				
			||||||
        <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>
 | 
					<div class="h-full flex flex-col justify-around shadow hover:shadow-lg">
 | 
				
			||||||
</nav>
 | 
					    <img class="w-full px-12" src="{% static 'img/recreo_logo.png' %}" alt="Recreo">
 | 
				
			||||||
 | 
					    <nav id="main_menu">
 | 
				
			||||||
 | 
					        <ul class="flex flex-col m-0 p-0 justify-center shadow hover:shadow-lg gap-y-12 items-center drop-shadow-lg">
 | 
				
			||||||
 | 
					            <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>
 | 
				
			||||||
 | 
					    <p id="page_title" class="text-center decoration-solid  font-mono font-bold text-lg page_title">Don Confiao - Tienda la Ilusión</p>
 | 
				
			||||||
 | 
					</div>
 | 
				
			||||||
 | 
					<script src="https://cdn.tailwindcss.com/"></script>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,24 +1,35 @@
 | 
				
			|||||||
{% extends 'don_confiao/base.html' %}
 | 
					{% extends 'don_confiao/base.html' %}
 | 
				
			||||||
{% block content %}
 | 
					{% block content %}
 | 
				
			||||||
{% load static %}
 | 
					{% load static %}
 | 
				
			||||||
<form id="complete_form_purchase" method="POST">
 | 
					<div class="flex h-full">
 | 
				
			||||||
  {% csrf_token %}
 | 
					  <div class="h-full w-10/12 flex flex-col p-5">
 | 
				
			||||||
  {{ sale_form }}
 | 
					    <form id="complete_form_purchase" method="POST" class="h-10/12 w-full max-h-full overflow-auto">
 | 
				
			||||||
  {{ linea_formset.management_form }}
 | 
					      {% csrf_token %}
 | 
				
			||||||
  <div id="formset-container">
 | 
					      {{ linea_formset.management_form }}
 | 
				
			||||||
    {% for form in linea_formset %}
 | 
					      <div id="formset-container" class="w-full">
 | 
				
			||||||
      <div class="form-container">
 | 
					        {% for form in linea_formset %}
 | 
				
			||||||
        <table style="border: solid 1px blue; margin: 10px">
 | 
					        <div class="form-container flex justify-center ">
 | 
				
			||||||
          {{ form.as_table }}
 | 
					          <table class="w-3/4 my-5 shadow-inner" style="border: solid 1px #178E79;">
 | 
				
			||||||
        </table>
 | 
					            {{ form.as_table }}
 | 
				
			||||||
 | 
					          </table>
 | 
				
			||||||
 | 
					          </div>
 | 
				
			||||||
 | 
					        {% endfor %}
 | 
				
			||||||
      </div>
 | 
					      </div>
 | 
				
			||||||
    {% endfor %}
 | 
					    </form>
 | 
				
			||||||
 | 
					    <div class="h-2/12 flex justify-center">
 | 
				
			||||||
 | 
					      <button id="add_line" type="button" class="bg-yellow-400 shadow hover:shadow-lg py-2 px-5 rounded-full font-bold hover:bg-violet-200 ease-in duration-150" onclick="add_line">Añadir Linea</button>
 | 
				
			||||||
 | 
					    </div>
 | 
				
			||||||
  </div>
 | 
					  </div>
 | 
				
			||||||
  <button id="add_line" type="button" onclick="add_line">Añadir Linea</button>
 | 
					  <div class="h-full w-3/12 bg-green-400 p-5 shadow hover:shadow-lg flex flex-col gap-y-3 font-semibold justify-around">
 | 
				
			||||||
  {{ summary_form }}
 | 
					    <p id="sale_resume_title" class="text-center decoration-solid font-mono font-bold text-xl page_title">Resumen de Venta</p>
 | 
				
			||||||
  <br/><button name="form" type="submit" >Comprar</button>
 | 
					    {{ sale_form }}
 | 
				
			||||||
  <script src="{% static 'js/add_line.js' %}"></script>
 | 
					    {{ summary_form }}
 | 
				
			||||||
  <script src="{% static 'js/sale_summary.js' %}"></script>
 | 
					    <button class="font-bold my-10 py-2 px-4 rounded-full bg-yellow-400 shadow hover:shadow-lg hover:bg-violet-200 ease-in duration-150" name="form" type="submit" >Comprar</button>
 | 
				
			||||||
  <script src="{% static 'js/calculate_subtotal_line.js' %}"></script>
 | 
					  </div>
 | 
				
			||||||
</form>
 | 
					</div>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					<script src="https://cdn.tailwindcss.com/"></script>
 | 
				
			||||||
 | 
					<script src="{% static 'js/add_line.js' %}"></script>
 | 
				
			||||||
 | 
					<script src="{% static 'js/sale_summary.js' %}"></script>
 | 
				
			||||||
 | 
					<script src="{% static 'js/calculate_subtotal_line.js' %}"></script>
 | 
				
			||||||
{% endblock %}
 | 
					{% endblock %}
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user