Merge pull request #83 from PenseNisso/style/searchfilter-suggestion

style(search-suggestion): fixed suggestion and search filter styles
PenseNisso · Dec 13, 2023 · 67a652b · 67a652b
2 parents 198e2ff + 51c5e66
commit 67a652b
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 13 deletions.
diff --git a/base_static/images/favicon.png b/base_static/images/favicon.png
diff --git a/base_templates/global/base.html b/base_templates/global/base.html
@@ -12,6 +12,7 @@
     <link rel="stylesheet" href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.13.2/themes/smoothness/jquery-ui.css">
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.7.1/jquery.min.js"></script>
     <script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.13.2/jquery-ui.min.js"></script>
+    <link rel="shortcut icon" type="image/png" href="{% static 'images/favicon.png' %}" >
 </head>
 
 <body>

diff --git a/company/templates/companies/company.html b/company/templates/companies/company.html
@@ -134,10 +134,15 @@ <h3 class="flex flex-row items-center gap-2 text-lg font-bold"><ion-icon class="
     class="bg-red-600 bg-opacity-60 w-1/3 py-1.5 px-3 font-bold rounded-md cursor-pointer hover:scale-[1.035] mt-2">
     <ion-icon name="megaphone"></ion-icon> Denunciar
   </button>
-  <button onclick="window.location.href='{% url 'comparator:comparator' %}'"
-    class="bg-blue-700 bg-opacity-30 w-1/3 py-1.5 px-3 font-bold rounded-md cursor-pointer hover:scale-[1.035] mt-2">
-    <ion-icon name="git-compare"></ion-icon> Compare
-  </button>
+  <form class="w-1/3 flex items-center justify-center bg-blue-700 bg-opacity-30 w-1/3 py-1.5 px-3 font-bold rounded-md cursor-pointer hover:scale-[1.035] mt-2" 
+        method="post" action="{% url 'comparator:comparator' %}">
+    {% csrf_token %}
+    <input type="hidden" name="company" value="{{company.name}}">
+    <button onclick="window.location.href='{% url 'comparator:comparator' %}'"
+    class="self-center">
+      <ion-icon name="git-compare"></ion-icon> Compare
+    </button>
+  </form>
 </div>
 
 {% endblock %}
diff --git a/company/templates/companies/forms/company_suggestion.html b/company/templates/companies/forms/company_suggestion.html
@@ -1,5 +1,6 @@
 {% extends "global/base.html" %} {% block title %} - Sugerir Empresa {% endblock %}
 {% block content %}
+{% load crispy_forms_tags %}
 
 <div class="flex flex-column justify-center items-center bg-blue-600 text-white w-full h-10 text-center my-6">
     <h1 class="text-2xl font-bold">Sugerir uma empresa</h1>
@@ -8,8 +9,10 @@ <h1 class="text-2xl font-bold">Sugerir uma empresa</h1>
 <div>
   <form action="/empresas/suggest" method="post">
       {% csrf_token %}
-      {{ form }}
-      <input type="submit" value="Enviar">
+      {{ form|crispy }}
+      <div class="flex flex-nowrap justify-center space-x-10 mt-4 w-full">
+        <input class="bg-blue-700 bg-opacity-30 py-1.5 px-6 font-semibold cursor-pointer rounded-md hover:scale-[1.035]" type="submit" value="Enviar">
+      </div>
   </form>
 </div>
 

diff --git a/home/templates/home.html b/home/templates/home.html
@@ -11,6 +11,7 @@
     <link rel="stylesheet" href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.13.2/themes/smoothness/jquery-ui.css">
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.7.1/jquery.min.js"></script>
     <script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.13.2/jquery-ui.min.js"></script>
+    <link rel="shortcut icon" type="image/png" href="{% static 'images/favicon.png' %}" >
     <link rel="stylesheet" href="{% static 'css/carousel.css' %}">
 </head>
 

diff --git a/search/templates/search.html b/search/templates/search.html
@@ -20,12 +20,18 @@
 
 {% block filter_box %}
     {% if query is not None and query%}
-        <form action="{% url 'search:search' %}" method="get">
-            {% csrf_token %}
-            <div>{{ form_filter }}</div>
-            <div>{{ form_sorting }}</div>
-            <input type="submit" value="Aplicar filtros">
-        </form>
+    <details class="collapse collapse-arrow bg-base-200">
+        <summary class="collapse-title text-m font-medium ml-2"><ion-icon class="mr-2"name="filter"></ion-icon> Filtrar e Ordenar por:</summary>
+        <div class="collapse-content"> 
+            <form class="flex flex-col gap-4"action="{% url 'search:search' %}" method="get">
+                {% csrf_token %}
+                <div class="flex flex-col justify-between md:flex-row md:gap-2">{{ form_filter }}</div>
+                <div>{{ form_sorting }}</div>
+                <input class="btn bg-blue-600 hover:bg-blue-700 w-fit text-white" type="submit" value="Aplicar Filtros">
+            </form>
+        </div>
+    </details>
+    <hr>
     {% endif %}
 {% endblock filter_box %}
 

diff --git a/search/templates/search/search_app_template.html b/search/templates/search/search_app_template.html
@@ -23,7 +23,7 @@ <h1>
             </ul>
         </div>
     </div>
-    <div>
+    <div class="mt-8">
         <div>
             <a href="{% url 'company:suggest' %}">Não encontrou o que procurava? Sugira uma empresa!</a>
         </div>