From 1c8cb20b670ea2db6d81b0a6081747939d8f02ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fe=CC=81lix=20Pe=CC=81ault?= <hello@flayks.com>
Date: Mon, 24 Aug 2020 11:18:09 +0200
Subject: [PATCH] Carousel: Add city in photo's caption instead of region

---
 src/organisms/Carousel.svelte                      | 10 +++++-----
 src/routes/viewer/[country]/[place]/[photo].svelte |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/organisms/Carousel.svelte b/src/organisms/Carousel.svelte
index e287060..5e76fb7 100644
--- a/src/organisms/Carousel.svelte
+++ b/src/organisms/Carousel.svelte
@@ -141,7 +141,7 @@
     <div class="wrap">
         <div class="gallery">
             <div class="gallery__images">
-                {#each photos as { id, name, location, image }, index}
+                {#each photos as { id, name, location, city, image }, index}
                 <div class="gallery__photo"
                     class:is-prev={id === prevPhoto.id}
                     class:is-active={id === currentPhoto.id}
@@ -158,7 +158,7 @@
                         <source media="(min-width: 500px)" data-srcset={getThumbnail(image.private_hash, 600)}>
                         <source media="(min-width: 300px)" data-srcset={getThumbnail(image.private_hash, 400)}>
                         <img src="data:image/png;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs="
-                            alt="{name}, {location.name}, {location.country.name}"
+                            alt="{name}, {city ? city : location.name}, {location.country.name}"
                             width={defaultWidth} height={defaultHeight}
                             class:lazyload={
                                 // Load the current index and the two previous/next ones
@@ -203,7 +203,7 @@
 
         <div class="carousel__infos">
             <div class="carousel__locations">
-                {#each photos as { id, name, location }, index}
+                {#each photos as { id, name, location, city }, index}
                 <div class="carousel__location style-location"
                     class:is-prev={id === prevPhoto.id}
                     class:is-active={id === currentPhoto.id}
@@ -213,10 +213,10 @@
                     <p class="state style-caps style-caps--transparent">
                         {#if locationUrl}
                         <a href="/location/{location.country.slug}/{location.slug}" sapper-noscroll>
-                            {location.name}, {location.country.name}
+                            {city ? city : location.name}, {location.country.name}
                         </a>
                         {:else}
-                            {location.name}, {location.country.name}
+                            {city ? city : location.name}, {location.country.name}
                         {/if}
                     </p>
                 </div>
diff --git a/src/routes/viewer/[country]/[place]/[photo].svelte b/src/routes/viewer/[country]/[place]/[photo].svelte
index cccbb78..4317757 100644
--- a/src/routes/viewer/[country]/[place]/[photo].svelte
+++ b/src/routes/viewer/[country]/[place]/[photo].svelte
@@ -63,7 +63,6 @@
 
     let windowWidth
     let gotoLink
-    let pageTitle
     let currentPhoto = photos.find(photo => photo.slug === $page.params.photo)
 
 
@@ -125,6 +124,7 @@
                 </a>
                 {/if}
             </div>
+
             <a href="/" bind:this={gotoLink} aria-hidden="true" hidden class="hidden" sapper-noscroll>&nbsp;</a>
         </div>