From cf6afd832ed5563ab95998c5c064ebe69f1a2ddf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fe=CC=81lix=20Pe=CC=81ault?= <hello@flayks.com>
Date: Sun, 14 Nov 2021 19:51:31 +0100
Subject: [PATCH] Add photo's city to Postcard on Photos grid

---
 src/components/molecules/PostCard.svelte | 1 -
 src/routes/photos.svelte                 | 6 ++++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/components/molecules/PostCard.svelte b/src/components/molecules/PostCard.svelte
index 8ee70e2..0ea80d1 100644
--- a/src/components/molecules/PostCard.svelte
+++ b/src/components/molecules/PostCard.svelte
@@ -39,7 +39,6 @@
         <ul class="postcard__address">
             <li>{street}</li>
             <li>{location}{region ? `, ${region}` : ''}</li>
-            <li>{country}</li>
         </ul>
     </div>
 </div>
\ No newline at end of file
diff --git a/src/routes/photos.svelte b/src/routes/photos.svelte
index a530f10..f1c443e 100644
--- a/src/routes/photos.svelte
+++ b/src/routes/photos.svelte
@@ -156,6 +156,7 @@
                             flag { id }
                         }
                     }
+                    city
                 }
             }
         `)
@@ -293,7 +294,7 @@
         <div class="grid container">
             {#if photos.length}
                 <div class="photos__grid">
-                    {#each photos as { image, slug, location, title }, index}
+                    {#each photos as { image, slug, location, title, city }, index}
                         <figure class="photo shadow-photo">
                             <a href="/{location.country.slug}/{location.slug}/{slug}">
                                 <Image
@@ -311,7 +312,7 @@
                             <figcaption>
                                 <PostCard
                                     street={title}
-                                    location={location.name}
+                                    location={city ? `${city}, ${location.name}` : location.name}
                                     region={location.region}
                                     country={location.country.name}
                                     flagId={location.country.flag.id}
@@ -400,6 +401,7 @@
                             flag { id }
                         }
                     }
+                    city
                     date_created
                 }