From ab2c9f4d2231c8848bd59a5bd58e6c9c36296c08 Mon Sep 17 00:00:00 2001
From: Pablo Moreno <pablo@kasfactory.net>
Date: Thu, 2 Jan 2025 13:35:05 +0100
Subject: [PATCH] fix: changed like button

---
 web/templates/components/icons/like.svg       |  2 +-
 web/templates/components/icons/liked.svg      | 17 ++++++++++
 web/templates/components/icons/x.svg          |  2 +-
 .../components/products/wishlist_button.html  | 32 +++++++++---------
 web/tests/test_wishlist.py                    | 33 +++++--------------
 web/utils.py                                  | 12 +------
 6 files changed, 44 insertions(+), 54 deletions(-)
 create mode 100644 web/templates/components/icons/liked.svg

diff --git a/web/templates/components/icons/like.svg b/web/templates/components/icons/like.svg
index 87639b3..3bedbd2 100644
--- a/web/templates/components/icons/like.svg
+++ b/web/templates/components/icons/like.svg
@@ -1,5 +1,5 @@
 <svg
-        class="w-5 h-5 -ms-2 me-2"
+        class="w-5 h-5 -ms-2"
         aria-hidden="true"
         xmlns="http://www.w3.org/2000/svg"
         width="24"
diff --git a/web/templates/components/icons/liked.svg b/web/templates/components/icons/liked.svg
new file mode 100644
index 0000000..18c964c
--- /dev/null
+++ b/web/templates/components/icons/liked.svg
@@ -0,0 +1,17 @@
+<svg
+        class="w-5 h-5 -ms-2"
+        aria-hidden="true"
+        xmlns="http://www.w3.org/2000/svg"
+        width="24"
+        height="24"
+        fill="red"
+        viewBox="0 0 24 24"
+>
+    <path
+            stroke="currentColor"
+            stroke-linecap="round"
+            stroke-linejoin="round"
+            stroke-width="0"
+            d="M12.01 6.001C6.5 1 1 8 5.782 13.001L12.011 20l6.23-7C23 8 17.5 1 12.01 6.002Z"
+    />
+</svg>
\ No newline at end of file
diff --git a/web/templates/components/icons/x.svg b/web/templates/components/icons/x.svg
index 96a1b09..6d6b0ca 100644
--- a/web/templates/components/icons/x.svg
+++ b/web/templates/components/icons/x.svg
@@ -1,4 +1,4 @@
-<svg class="me-1.5 h-5 w-5" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none"
+<svg class="h-5 w-5" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none"
      viewBox="0 0 24 24">
     <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
           d="M6 18 17.94 6M18 18 6.06 6"/>
diff --git a/web/templates/components/products/wishlist_button.html b/web/templates/components/products/wishlist_button.html
index a309935..816f448 100644
--- a/web/templates/components/products/wishlist_button.html
+++ b/web/templates/components/products/wishlist_button.html
@@ -1,20 +1,20 @@
 {% load i18n %}
 {% if is_wishlisted %}
-<form action="" hx-post="{% url 'web:delete_from_wishlist' pk=product.pk %}" hx-swap="none">
-  <input type="hidden" name="product" value="{{ product.pk }}">
-  {% csrf_token %}
-  <button class="flex items-center justify-center py-2.5 px-5 text-sm font-medium text-gray-900 focus:outline-none bg-white rounded-lg border border-gray-200 hover:bg-gray-100 hover:text-primary-700 focus:z-10 focus:ring-4 focus:ring-gray-100 dark:focus:ring-gray-700 dark:bg-gray-800 dark:text-gray-400 dark:border-gray-600 dark:hover:text-white dark:hover:bg-gray-700">
-    {% include 'components/icons/x.svg' %}
-    {% translate 'Quitar de la lista de deseados' %}
-  </button>
-</form>
+  <form action="" hx-post="{% url 'web:delete_from_wishlist' pk=product.pk %}" hx-swap="none">
+    <input type="hidden" name="product" value="{{ product.pk }}">
+    {% csrf_token %}
+    <button
+      class="flex items-center justify-center rounded-full px-1.5 py-2 text-l font-medium text-gray-900 focus:outline-none bg-white border border-gray-200 hover:bg-gray-100 hover:text-primary-700 focus:z-10 focus:ring-4 focus:ring-gray-100 dark:focus:ring-gray-700 dark:bg-gray-800 dark:text-gray-400 dark:border-gray-600 dark:hover:text-white dark:hover:bg-gray-700">
+      {% include 'components/icons/liked.svg' %}
+    </button>
+  </form>
 {% else %}
-<form action="" hx-post="{% url 'web:add_to_wishlist' %}" hx-swap="none">
-  <input type="hidden" name="product" value="{{ product.pk }}">
-  {% csrf_token %}
-  <button class="flex items-center justify-center py-2.5 px-5 text-sm font-medium text-gray-900 focus:outline-none bg-white rounded-lg border border-gray-200 hover:bg-gray-100 hover:text-primary-700 focus:z-10 focus:ring-4 focus:ring-gray-100 dark:focus:ring-gray-700 dark:bg-gray-800 dark:text-gray-400 dark:border-gray-600 dark:hover:text-white dark:hover:bg-gray-700">
-    {% include 'components/icons/like.svg' %}
-    {% translate 'Añadir a lista de deseados' %}
-  </button>
-</form>
+  <form action="" hx-post="{% url 'web:add_to_wishlist' %}" hx-swap="none">
+    <input type="hidden" name="product" value="{{ product.pk }}">
+    {% csrf_token %}
+    <button
+      class="flex items-center justify-center rounded-full px-1.5 py-2 text-l font-medium text-gray-900 focus:outline-none bg-white border border-gray-200 hover:bg-gray-100 hover:text-primary-700 focus:z-10 focus:ring-4 focus:ring-gray-100 dark:focus:ring-gray-700 dark:bg-gray-800 dark:text-gray-400 dark:border-gray-600 dark:hover:text-white dark:hover:bg-gray-700">
+      {% include 'components/icons/like.svg' %}
+    </button>
+  </form>
 {% endif %}
\ No newline at end of file
diff --git a/web/tests/test_wishlist.py b/web/tests/test_wishlist.py
index 870d14a..7a3fa5a 100644
--- a/web/tests/test_wishlist.py
+++ b/web/tests/test_wishlist.py
@@ -2,9 +2,8 @@ from django.contrib.auth.models import User
 from django.test import TestCase
 from django.urls import reverse
 
-from shop.models import Cart, CartItem, WishlistedProduct
+from shop.models import WishlistedProduct
 from shop.tests.mixins import CreateProductsMixin
-from web.settings import ANONYMOUS_CART_ID_COOKIE_NAME
 
 
 class TestWishlist(TestCase, CreateProductsMixin):
@@ -47,8 +46,7 @@ class TestWishlist(TestCase, CreateProductsMixin):
 
     def test_logged_user_delete_wishlisted_product(self):
         wishlisted = WishlistedProduct.objects.create(
-            user=self.user,
-            product=self.product,
+            user=self.user, product=self.product
         )
         self.client.force_login(self.user)
         response = self.client.post(
@@ -60,33 +58,18 @@ class TestWishlist(TestCase, CreateProductsMixin):
         ).exists()
 
     def test_logged_user_wishlist(self):
-        WishlistedProduct.objects.create(
-            user=self.user,
-            product=self.product,
-        )
+        WishlistedProduct.objects.create(user=self.user, product=self.product)
         self.client.force_login(self.user)
-        response = self.client.get(
-            reverse("web:wishlist")
-        )
+        response = self.client.get(reverse("web:wishlist"))
         assert response.status_code == 200
 
     def test_not_logged_user_wishlist(self):
-        WishlistedProduct.objects.create(
-            user=self.user,
-            product=self.product,
-        )
-        response = self.client.get(
-            reverse("web:wishlist")
-        )
+        WishlistedProduct.objects.create(user=self.user, product=self.product)
+        response = self.client.get(reverse("web:wishlist"))
         assert response.status_code == 302
 
     def test_list_wishlisted_products(self):
-        WishlistedProduct.objects.create(
-            user=self.user,
-            product=self.product,
-        )
+        WishlistedProduct.objects.create(user=self.user, product=self.product)
         self.client.force_login(self.user)
-        response = self.client.get(
-            reverse("web:list_wishlisted_products")
-        )
+        response = self.client.get(reverse("web:list_wishlisted_products"))
         assert response.status_code == 200
diff --git a/web/utils.py b/web/utils.py
index 8a00b3f..bcc75dd 100644
--- a/web/utils.py
+++ b/web/utils.py
@@ -1,8 +1,4 @@
-from decimal import Decimal
-
-from django.db.models import Sum
-
-from shop.models import Cart, CartItem
+from shop.models import Cart
 from web.settings import ANONYMOUS_CART_ID_COOKIE_NAME
 
 
@@ -20,9 +16,3 @@ def get_or_create_cart(request) -> [Cart, bool]:
         cart, created = Cart.objects.get_or_create(user=request.user)
 
     return cart, created
-
-
-def get_cart_total(cart: Cart):
-    return CartItem.objects.filter(cart=cart).annotate(cart_total=Sum("total")).get(
-        "cart_total"
-    ) or Decimal("0.00")