From 8b75aea5ad7ae35b2d1dbbec86a72e9c53a9c713 Mon Sep 17 00:00:00 2001
From: Pablo Moreno <pablo@kasfactory.net>
Date: Mon, 27 Jan 2025 17:52:01 +0100
Subject: [PATCH] fix: styling

---
 theme/templates/components/theme-switch.html  |  2 +-
 .../components/cart/cart_navbar.html          |  2 +-
 web/templates/components/generic/navbar.html  |  8 +--
 web/templates/web/index.html                  |  2 +-
 web/templates/web/list_products.html          | 63 ++++++++++---------
 web/views/components.py                       |  2 +
 6 files changed, 43 insertions(+), 36 deletions(-)

diff --git a/theme/templates/components/theme-switch.html b/theme/templates/components/theme-switch.html
index 0575891..94672dd 100644
--- a/theme/templates/components/theme-switch.html
+++ b/theme/templates/components/theme-switch.html
@@ -3,7 +3,7 @@
   id="theme-toggle"
   type="button"
   aria-label="switchtheme"
-  class="text-gray-500 dark:text-gray-400 hover:bg-gray-100 dark:hover:bg-gray-700 focus:outline-none rounded-lg text-sm p-2.5 cursor-pointer">
+  class="text-gray-500 dark:text-gray-400 hover:bg-gray-100 dark:hover:bg-gray-700 focus:outline-none rounded-lg text-sm p-4 cursor-pointer">
     {% include 'components/icons/moon.svg' %}
     {% include 'components/icons/sun.svg' %}
 </button>
diff --git a/web/templates/components/cart/cart_navbar.html b/web/templates/components/cart/cart_navbar.html
index 5c1d397..f932e7d 100644
--- a/web/templates/components/cart/cart_navbar.html
+++ b/web/templates/components/cart/cart_navbar.html
@@ -12,7 +12,7 @@
 
 <!-- Cart -->
 <div id="myCartDropdown1"
-     class="absolute top-10 z-10 w-56 divide-y divide-gray-100 overflow-hidden overflow-y-auto rounded-lg bg-white antialiased shadow dark:divide-gray-600 dark:bg-gray-700 right-0 p-4 hidden"
+     class="absolute top-12 z-10 w-65 divide-y divide-gray-100 overflow-hidden overflow-y-auto rounded-lg bg-white antialiased shadow dark:divide-gray-600 dark:bg-gray-700 right-0 p-4 hidden"
 >
     <div>
         {% if cart.items.count == 0 %}
diff --git a/web/templates/components/generic/navbar.html b/web/templates/components/generic/navbar.html
index 938111b..dc93832 100644
--- a/web/templates/components/generic/navbar.html
+++ b/web/templates/components/generic/navbar.html
@@ -48,7 +48,7 @@
             id="userDropdownButton1"
             data-dropdown-toggle="userDropdown1" type="button"
             aria-label="show menu"
-            class="inline-flex items-center rounded-lg justify-center p-2 hover:bg-gray-100 dark:hover:bg-gray-700 text-sm font-medium leading-none text-gray-900 dark:text-white cursor-pointer">
+            class="inline-flex items-center rounded-lg justify-center p-4 hover:bg-gray-100 dark:hover:bg-gray-700 text-sm font-medium leading-none text-gray-900 dark:text-white cursor-pointer">
             {% include 'components/icons/user.svg' %}
             <span class="hidden sm:flex">
               {% translate 'Mi cuenta' %}
@@ -58,12 +58,12 @@
 
           <!-- User account dropdown -->
           <div id="userDropdown1"
-               class="absolute top-10 hidden z-10 w-56 divide-y divide-gray-100 overflow-hidden overflow-y-auto rounded-lg bg-white antialiased shadow dark:divide-gray-600 dark:bg-gray-700 right-0">
+               class="absolute top-12 hidden z-12 w-56 divide-y divide-gray-100 overflow-hidden overflow-y-auto rounded-lg bg-white antialiased shadow dark:divide-gray-600 dark:bg-gray-700 right-0">
             {% include 'components/users/user_dropdown.html' %}
           </div>
         {% else %}
           <a href="{% url 'web:login' %}"
-             class="inline-flex items-center rounded-lg justify-center p-2 hover:bg-gray-100 dark:hover:bg-gray-700 text-sm font-medium leading-none text-gray-900 dark:text-white">
+             class="inline-flex items-center rounded-lg justify-center p-4 hover:bg-gray-100 dark:hover:bg-gray-700 text-sm font-medium leading-none text-gray-900 dark:text-white">
             Inicia sesión
           </a>
         {% endif %}
@@ -73,7 +73,7 @@
                 data-collapse-toggle="ecommerce-navbar-menu-1" aria-controls="ecommerce-navbar-menu-1"
                 aria-expanded="false"
                 aria-label="show menu"
-                class="inline-flex lg:hidden items-center justify-center hover:bg-gray-100 rounded-md dark:hover:bg-gray-700 p-2 text-gray-900 dark:text-white cursor-pointer">
+                class="inline-flex lg:hidden items-center justify-center hover:bg-gray-100 rounded-md dark:hover:bg-gray-700 p-4 text-gray-900 dark:text-white cursor-pointer">
           <span class="sr-only">
             {% translate 'Abrir menú' %}
           </span>
diff --git a/web/templates/web/index.html b/web/templates/web/index.html
index 46f5256..24303af 100644
--- a/web/templates/web/index.html
+++ b/web/templates/web/index.html
@@ -6,7 +6,7 @@
   <div>
     {% include 'components/products/list_filters.html' %}
     <section
-      class="p-8"
+      class="px-8"
       hx-get="
         {% url 'web:list_products' %}{% querystring request.GET %}{% if filter_by_category %}{% querystring category=category.id %}{% endif %}"
       hx-trigger="load"
diff --git a/web/templates/web/list_products.html b/web/templates/web/list_products.html
index e49f56a..26b62c1 100644
--- a/web/templates/web/list_products.html
+++ b/web/templates/web/list_products.html
@@ -1,7 +1,7 @@
 {% load i18n %}
 {% load static %}
 
-<ul class="mb-4 grid gap-4 sm:grid-cols-2 md:mb-8 lg:grid-cols-3 xl:grid-cols-4">
+<ul class="mb-4 grid gap-4 sm:grid-cols-2 md:mb-8 lg:grid-cols-3 xl:grid-cols-4 3xl:grid-cols-5">
   {% for product in page %}
     <li>
       {% include 'components/product_card.html' %}
@@ -9,32 +9,37 @@
   {% endfor %}
 </ul>
 
+<div class="flex justify-center items-center">
+  {% if has_previous_page %}
+    <button type="button"
+            class="rounded-lg border border-gray-200 bg-white px-5 py-2.5 text-sm font-medium text-gray-900
+    hover:bg-gray-100 hover:text-primary-700 focus:z-10 focus:outline-none focus:ring-4
+    focus:ring-gray-100 dark:border-gray-600 dark:bg-gray-800 dark:text-gray-400 dark:hover:bg-gray-700
+    dark:hover:text-white dark:focus:ring-gray-700 cursor-pointer"
+            hx-get="{% url 'web:list_products' %}{% querystring page=page.previous_page_number %}"
+            hx-trigger="click"
+            hx-target="#products"
+            hx-swap="innerHTML"
+    >
+      {% translate 'Anterior' %}
+    </button>
+  {% endif %}
+  {% if has_next_page %}
+    <button type="button"
+            class="rounded-lg border border-gray-200 bg-white px-5 py-2.5 text-sm font-medium text-gray-900
+    hover:bg-gray-100 hover:text-primary-700 focus:z-10 focus:outline-none focus:ring-4
+    focus:ring-gray-100 dark:border-gray-600 dark:bg-gray-800 dark:text-gray-400 dark:hover:bg-gray-700
+    dark:hover:text-white dark:focus:ring-gray-700 cursor-pointer"
+            hx-get="{% url 'web:list_products' %}{% querystring page=page.next_page_number %}"
+            hx-trigger="click"
+            hx-target="#products"
+            hx-swap="innerHTML"
+    >
+      {% translate 'Siguiente' %}
+    </button>
+  {% endif %}
 
-{% if has_previous_page %}
-<button type="button"
-  class="rounded-lg border border-gray-200 bg-white px-5 py-2.5 text-sm font-medium text-gray-900
-    hover:bg-gray-100 hover:text-primary-700 focus:z-10 focus:outline-none focus:ring-4
-    focus:ring-gray-100 dark:border-gray-600 dark:bg-gray-800 dark:text-gray-400 dark:hover:bg-gray-700
-    dark:hover:text-white dark:focus:ring-gray-700 cursor-pointer"
-  hx-get="{% url 'web:list_products' %}{% querystring page=page.previous_page_number %}"
-  hx-trigger="click"
-  hx-target="#products"
-  hx-swap="innerHTML"
->
-  {% translate 'Anterior' %}
-</button>
-{% endif %}
-{% if has_next_page %}
-<button type="button"
-  class="rounded-lg border border-gray-200 bg-white px-5 py-2.5 text-sm font-medium text-gray-900
-    hover:bg-gray-100 hover:text-primary-700 focus:z-10 focus:outline-none focus:ring-4
-    focus:ring-gray-100 dark:border-gray-600 dark:bg-gray-800 dark:text-gray-400 dark:hover:bg-gray-700
-    dark:hover:text-white dark:focus:ring-gray-700 cursor-pointer"
-  hx-get="{% url 'web:list_products' %}{% querystring page=page.next_page_number %}"
-  hx-trigger="click"
-  hx-target="#products"
-  hx-swap="innerHTML"
->
-  {% translate 'Siguiente' %}
-</button>
-{% endif %}
+</div>
+<span class="flex justify-center items-center text-lg text-gray-900 dark:text-gray-400 mt-4">
+  {% blocktranslate %}Página {{ current_page }} de {{ num_pages }}{% endblocktranslate %}
+</span>
diff --git a/web/views/components.py b/web/views/components.py
index 78062bf..27b334f 100644
--- a/web/views/components.py
+++ b/web/views/components.py
@@ -37,6 +37,8 @@ class ListProducts(TemplateView, FilteredQuerysetMixin, PaginatedQuerysetMixin):
         page = self.get_paginated_queryset(qs)
 
         return {
+            "current_page": page.number,
+            "num_pages": page.paginator.num_pages,
             "page": page,
             "has_next_page": page.has_next(),
             "has_previous_page": page.has_previous(),