From 1e9f1a27617cbed759436eb4141cb3ae00b4ac80 Mon Sep 17 00:00:00 2001
From: Jannis Portmann <jannisp@student.ethz.ch>
Date: Mon, 18 Sep 2023 11:37:01 +0200
Subject: [PATCH 1/3] Fix spacing issue

---
 .../pflaenzli/templates/offer/search.html     | 45 ++++++++++---------
 .../pflaenzli/templates/user/public.html      |  4 +-
 2 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/pflaenzli/pflaenzli/templates/offer/search.html b/pflaenzli/pflaenzli/templates/offer/search.html
index bd65b74..c1b5328 100644
--- a/pflaenzli/pflaenzli/templates/offer/search.html
+++ b/pflaenzli/pflaenzli/templates/offer/search.html
@@ -2,6 +2,7 @@
 {% load static %}
 {% load i18n %}
 {% load crispy_forms_tags %}
+{% load plz %}
 {% block title %}
     {% trans 'Offers' %}
 {% endblock %}
@@ -31,30 +32,32 @@
     {% if offers %}
         <div class="row row-cols-1 row-cols-md-2 row-cols-xl-3 mt-3 mb-3 row-gap-5">
             {% for offer in offers %}
-                <div class="col">
-                    <div class="card h-100 p-0">
-                        <a href="{% url 'offer_detail' offer.id %}">
-                            {% if offer.image %}
-                                <img class="card-img-top offer-img" src="{{ offer.image.url }}"/>
-                            {% else %}
-                                <img class="card-img-top offer-img" src="{% static 'placeholder.jpg' %}" />
-                            {% endif %}
-                            <div class="card-body">
-                                <h5 class="h5">
-                                    {{ offer.title }}<span class="ms-2 badge pfl-{{ offer.category|lower }}">{{ offer.get_category_display }}</span>
-                                </h5>
-                            </div>
-                        </a>
-                        <div class="card-footer d-flex justify-content-between">
-                            <a href="{% url 'user_detail' offer.user.id %}">
-                                <i class="fas fa-user mt-3"></i> {{ offer.user.username }}
+                {% with plz=offer|get_plz %}
+                    <div class="col">
+                        <div class="card h-100 p-0">
+                            <a href="{% url 'offer_detail' offer.id %}">
+                                {% if offer.image %}
+                                    <img class="card-img-top offer-img" src="{{ offer.image.url }}" />
+                                {% else %}
+                                    <img class="card-img-top offer-img" src="{% static 'placeholder.jpg' %}" />
+                                {% endif %}
+                                <div class="card-body">
+                                    <h5 class="h5">
+                                        {{ offer.title }}<span class="ms-2 badge pfl-{{ offer.category|lower }}">{{ offer.get_category_display }}</span>
+                                    </h5>
+                                </div>
                             </a>
-                            <p class="zip">
-                                <i class="fas fa-map-marker-alt mt-3"></i> {{ offer.zipcode }}
-                            </p>
+                            <div class="card-footer d-flex justify-content-between mt-auto">
+                                <a href="{% url 'user_detail' offer.user.id %}">
+                                    <i class="fas fa-user mt-3"></i> {{ offer.user.username }}
+                                </a>
+                                <p class="zip">
+                                    <i class="fas fa-map-marker-alt mt-3"></i> {{ plz.plz }} {{ plz.name }}
+                                </p>
+                            </div>
                         </div>
                     </div>
-                </div>
+                {% endwith %}
             {% endfor %}
         </div>
     {% else %}
diff --git a/pflaenzli/pflaenzli/templates/user/public.html b/pflaenzli/pflaenzli/templates/user/public.html
index 2f1b35d..b5c2e35 100644
--- a/pflaenzli/pflaenzli/templates/user/public.html
+++ b/pflaenzli/pflaenzli/templates/user/public.html
@@ -36,12 +36,12 @@
                                 </h5>
                             </div>
                         </a>
-                        <div class="card-footer d-flex justify-content-between">
+                        <div class="card-footer d-flex justify-content-between mt-auto">
                             <a href="{% url 'user_detail' offer.user.id %}">
                                 <i class="fas fa-user mt-3"></i> {{ offer.user.username }}
                             </a>
                             <p class="zip">
-                                <i class="fas fa-map-marker-alt mt-3"></i> {{ offer.zipcode }}
+                                <i class="fas fa-map-marker-alt mt-3"></i> {{ offer.zipcode.plz }} {{ offer.zipcode.name }}
                             </p>
                         </div>
                     </div>

From 25d089cbdcffdc3cccc27ec1e488b38ca995230d Mon Sep 17 00:00:00 2001
From: Jannis Portmann <jannisp@student.ethz.ch>
Date: Mon, 18 Sep 2023 11:39:27 +0200
Subject: [PATCH 2/3] Remove unfinished changes

---
 .../pflaenzli/templates/offer/search.html     | 45 +++++++++----------
 .../pflaenzli/templates/user/public.html      |  4 +-
 2 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/pflaenzli/pflaenzli/templates/offer/search.html b/pflaenzli/pflaenzli/templates/offer/search.html
index c1b5328..2e6c1df 100644
--- a/pflaenzli/pflaenzli/templates/offer/search.html
+++ b/pflaenzli/pflaenzli/templates/offer/search.html
@@ -2,7 +2,6 @@
 {% load static %}
 {% load i18n %}
 {% load crispy_forms_tags %}
-{% load plz %}
 {% block title %}
     {% trans 'Offers' %}
 {% endblock %}
@@ -32,32 +31,30 @@
     {% if offers %}
         <div class="row row-cols-1 row-cols-md-2 row-cols-xl-3 mt-3 mb-3 row-gap-5">
             {% for offer in offers %}
-                {% with plz=offer|get_plz %}
-                    <div class="col">
-                        <div class="card h-100 p-0">
-                            <a href="{% url 'offer_detail' offer.id %}">
-                                {% if offer.image %}
-                                    <img class="card-img-top offer-img" src="{{ offer.image.url }}" />
-                                {% else %}
-                                    <img class="card-img-top offer-img" src="{% static 'placeholder.jpg' %}" />
-                                {% endif %}
-                                <div class="card-body">
-                                    <h5 class="h5">
-                                        {{ offer.title }}<span class="ms-2 badge pfl-{{ offer.category|lower }}">{{ offer.get_category_display }}</span>
-                                    </h5>
-                                </div>
-                            </a>
-                            <div class="card-footer d-flex justify-content-between mt-auto">
-                                <a href="{% url 'user_detail' offer.user.id %}">
-                                    <i class="fas fa-user mt-3"></i> {{ offer.user.username }}
-                                </a>
-                                <p class="zip">
-                                    <i class="fas fa-map-marker-alt mt-3"></i> {{ plz.plz }} {{ plz.name }}
-                                </p>
+                <div class="col">
+                    <div class="card h-100 p-0">
+                        <a href="{% url 'offer_detail' offer.id %}">
+                            {% if offer.image %}
+                                <img class="card-img-top offer-img" src="{{ offer.image.url }}" />
+                            {% else %}
+                                <img class="card-img-top offer-img" src="{% static 'placeholder.jpg' %}" />
+                            {% endif %}
+                            <div class="card-body">
+                                <h5 class="h5">
+                                    {{ offer.title }}<span class="ms-2 badge pfl-{{ offer.category|lower }}">{{ offer.get_category_display }}</span>
+                                </h5>
                             </div>
+                        </a>
+                        <div class="card-footer d-flex justify-content-between mt-auto">
+                            <a href="{% url 'user_detail' offer.user.id %}">
+                                <i class="fas fa-user mt-3"></i> {{ offer.user.username }}
+                            </a>
+                            <p class="zip">
+                                <i class="fas fa-map-marker-alt mt-3"></i> {{ offer.zipcode }}
+                            </p>
                         </div>
                     </div>
-                {% endwith %}
+                </div>
             {% endfor %}
         </div>
     {% else %}
diff --git a/pflaenzli/pflaenzli/templates/user/public.html b/pflaenzli/pflaenzli/templates/user/public.html
index b5c2e35..416a270 100644
--- a/pflaenzli/pflaenzli/templates/user/public.html
+++ b/pflaenzli/pflaenzli/templates/user/public.html
@@ -32,7 +32,7 @@
                             {% endif %}
                             <div class="card-body">
                                 <h5 class="h5">
-                                    {{ offer.title }}<span class="ms-2 badge pfl-{{ offer.category|lower }}">{{ offer.get_category_display }}</span>
+                                <i class="fas fa-map-marker-alt mt-3"></i> {{ offer.zipcode }}
                                 </h5>
                             </div>
                         </a>
@@ -41,7 +41,7 @@
                                 <i class="fas fa-user mt-3"></i> {{ offer.user.username }}
                             </a>
                             <p class="zip">
-                                <i class="fas fa-map-marker-alt mt-3"></i> {{ offer.zipcode.plz }} {{ offer.zipcode.name }}
+                                <i class="fas fa-map-marker-alt mt-3"></i> {{ offer.zipcode }}
                             </p>
                         </div>
                     </div>

From 9eca8d61f931757c2b91c5b31ce40eb74cb95e69 Mon Sep 17 00:00:00 2001
From: Jannis Portmann <jannisp@student.ethz.ch>
Date: Mon, 18 Sep 2023 11:43:05 +0200
Subject: [PATCH 3/3] Fix title

---
 pflaenzli/pflaenzli/templates/user/public.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pflaenzli/pflaenzli/templates/user/public.html b/pflaenzli/pflaenzli/templates/user/public.html
index 416a270..cf16daf 100644
--- a/pflaenzli/pflaenzli/templates/user/public.html
+++ b/pflaenzli/pflaenzli/templates/user/public.html
@@ -32,7 +32,7 @@
                             {% endif %}
                             <div class="card-body">
                                 <h5 class="h5">
-                                <i class="fas fa-map-marker-alt mt-3"></i> {{ offer.zipcode }}
+                                    {{ offer.title }}<span class="ms-2 badge pfl-{{ offer.category|lower }}">{{ offer.get_category_display }}</span>
                                 </h5>
                             </div>
                         </a>